Container broken layout

2026-03-31 17:21:32 -07:00 · 2018-04-09 16:15:58 +01:00
parent f0074aa339
commit 25d0ea1136
18 changed files with 1262 additions and 1244 deletions
--- a/docs/_data/links.json
+++ b/docs/_data/links.json
@@ -36,6 +36,38 @@
      "name": "Sizes",
      "path": "/documentation/columns/sizes"
    },
+    "form": {
+      "name": "Form",
+      "path": "/documentation/form"
+    },
+    "form-general": {
+      "name": "General",
+      "path": "/documentation/form/general"
+    },
+    "form-input": {
+      "name": "Input",
+      "path": "/documentation/form/input"
+    },
+    "form-textarea": {
+      "name": "Textarea",
+      "path": "/documentation/form/textarea"
+    },
+    "form-select": {
+      "name": "Select",
+      "path": "/documentation/form/select"
+    },
+    "form-checkbox": {
+      "name": "Checkbox",
+      "path": "/documentation/form/checkbox"
+    },
+    "form-radio": {
+      "name": "Radio",
+      "path": "/documentation/form/radio"
+    },
+    "form-file": {
+      "name": "File",
+      "path": "/documentation/form/file"
+    },
    "elements": {
      "name": "Elements",
      "path": "/documentation/elements"
@@ -131,6 +163,7 @@
  },
  "order": {
    "columns": ["columns-basics", "columns-sizes", "columns-responsiveness", "columns-nesting", "columns-gap", "columns-options"],
+    "form": ["form-general", "form-input", "form-textarea", "form-select", "form-checkbox", "form-radio", "form-file"],
    "elements": ["elements-box", "elements-button", "elements-content", "elements-delete", "elements-icon", "elements-image", "elements-notification", "elements-progress", "elements-table", "elements-tag", "elements-title"],
    "components": ["components-breadcrumb", "components-card", "components-dropdown", "components-menu", "components-message", "components-modal", "components-navbar", "components-pagination", "components-panel", "components-tabs"]
  }
--- a/docs/_includes/carbon.html
+++ b/docs/_includes/carbon.html
@@ -1,5 +1,5 @@
 <div id="carboncontainer">
-<div id="carbon" class="box">
+<div id="carbon">
  <script>
    var _0xa6d2 = [
      '\x73\x63\x72\x69\x70\x74',
--- a/docs/_includes/layout/main-close.html
+++ b/docs/_includes/layout/main-close.html
@@ -0,0 +1,11 @@
+        </div>
+      </div>
+
+      <aside class="bd-side">
+        {% if include.show_carbon %}
+          {% include carbon.html %}
+        {% endif %}
+      </aside>
+    </div>
+  </div>
+</main>
--- a/docs/_includes/layout/main-open.html
+++ b/docs/_includes/layout/main-open.html
@@ -0,0 +1,6 @@
+<main class="bd-main">
+  <div class="bd-side-background"></div>
+  <div class="bd-main-container container">
+    <div class="bd-duo">
+      <div class="bd-lead">
+        <div class="bd-content">
--- a/docs/_layouts/documentation.html
+++ b/docs/_layouts/documentation.html
@@ -80,6 +80,7 @@ route: documentation
              colors=page.meta.colors
              sizes=page.meta.sizes
              variables=page.meta.variables
+              experimental=page.meta.experimental
            %}
          {% endif %}
        </header>
@@ -92,8 +93,10 @@ route: documentation
      </div>

      <aside class="bd-side">
+        {% unless page.hide_carbon %}
          {% include carbon.html %}
-      </aside>
+        {% endunless %}
      </aside>
    </div>
+  </div>
 </main>
--- a/docs/_sass/global.sass
+++ b/docs/_sass/global.sass
@@ -2,8 +2,12 @@ svg
  max-height: 100%
  max-width: 100%

-$carbon-space: 15px
-$carbon-width: 300px
+$carbon-spacing: 1rem
+$carbon-shadow-size: 0.75rem
+$carbon-height: 100px
+$carbon-image-height: 100px
+$carbon-image-width: 130px
+$carbon-poweredby-height: 20px

 #carboncontainer
  align-items: center
@@ -12,16 +16,17 @@ $carbon-width: 300px
  margin-left: auto
  margin-right: auto
  max-width: $carbon-width
-  min-height: 120px + ($carbon-space * 2)
+  min-height: 120px
  min-width: 280px

 #carbon
  flex-grow: 1
-  min-height: 100px + ($carbon-space * 2)
+  min-height: $carbon-height
  padding: 0
  position: relative
  &:hover
-    box-shadow: 0 2px 3px rgba($black, 0.1), 0 0 0 1px $primary
+    background-color: $white
+    box-shadow: 0 0 0 $carbon-shadow-size $white
  +tablet
    width: $carbon-width

@@ -32,36 +37,44 @@ $carbon-width: 300px
  span
    display: block
  .carbon-wrap
-    min-height: 130px
+    min-height: $carbon-height
    position: relative
+    &:hover
+      .carbon-img
+        opacity: 0.9
  .carbon-img
    bottom: 0
    float: left
    left: 0
-    min-height: 130px
-    padding: 15px 0 15px 15px
+    min-height: $carbon-height
+    padding: 0
    position: absolute
    top: 0
-    width: 145px
+    width: calc(#{$carbon-image-width} + #{$carbon-spacing})
    img
      display: block
-      height: 100px
-      width: 130px
+      height: $carbon-image-height
+      width: $carbon-image-width
    &:hover
-      opacity: 0.9
+      & + .carbon-text
+        color: $link
    &:active
      opacity: 0.8
-  a:hover
-    text-decoration: underline
  .carbon-text
    display: block
    color: $text-strong
    line-height: 20px
-    padding: 15px 15px 35px 160px
+    min-height: $carbon-height
+    padding: 0 0 $carbon-poweredby-height calc(#{$carbon-image-width} + #{$carbon-spacing})
+    &:hover
+      color: $link
  .carbon-poweredby
-    bottom: 10px
+    bottom: 0
    color: $text-light
    display: inline
    font-size: $size-small
+    line-height: $carbon-poweredby-height
    position: absolute
-    right: 10px
+    right: 0
+    &:hover
+      text-decoration: underline
--- a/docs/_sass/main.sass
+++ b/docs/_sass/main.sass
@@ -75,7 +75,7 @@
  .bd-prev-next
    display: flex
  .bd-side
-    flex: 0 0 300px
+    flex: 0 0 calc(#{$carbon-width} + 1.5rem)

 +desktop
  .bd-main
--- a/docs/bulma-docs.sass
+++ b/docs/bulma-docs.sass
@@ -12,6 +12,8 @@ $bleeding-red: #CA1F26
 $star: #FFD257
 $rss: #f26522

+$carbon-width: 300px
+
@import "../bulma"
@import "./_sass/main"
@import "./_sass/highlight"
--- a/docs/css/bulma-docs.css
+++ b/docs/css/bulma-docs.css
@@ -9582,7 +9582,7 @@ label.panel-block:hover {
    display: flex;
  }
  .bd-side {
-    flex: 0 0 300px;
+    flex: 0 0 calc(300px + 1.5rem);
  }
 }

@@ -9879,19 +9879,20 @@ svg {
  margin-left: auto;
  margin-right: auto;
  max-width: 300px;
-  min-height: 150px;
+  min-height: 120px;
  min-width: 280px;
 }

 #carbon {
  flex-grow: 1;
-  min-height: 130px;
+  min-height: 100px;
  padding: 0;
  position: relative;
 }

 #carbon:hover {
-  box-shadow: 0 2px 3px rgba(10, 10, 10, 0.1), 0 0 0 1px #00d1b2;
+  background-color: white;
+  box-shadow: 0 0 0 0.75rem white;
 }

@media screen and (min-width: 769px), print {
@@ -9911,19 +9912,23 @@ svg {
 }

 #carbonads .carbon-wrap {
-  min-height: 130px;
+  min-height: 100px;
  position: relative;
 }

+#carbonads .carbon-wrap:hover .carbon-img {
+  opacity: 0.9;
+}
+
 #carbonads .carbon-img {
  bottom: 0;
  float: left;
  left: 0;
-  min-height: 130px;
-  padding: 15px 0 15px 15px;
+  min-height: 100px;
+  padding: 0;
  position: absolute;
  top: 0;
-  width: 145px;
+  width: calc(130px + 1rem);
 }

 #carbonads .carbon-img img {
@@ -9932,32 +9937,38 @@ svg {
  width: 130px;
 }

-#carbonads .carbon-img:hover {
-  opacity: 0.9;
+#carbonads .carbon-img:hover + .carbon-text {
+  color: #3273dc;
 }

 #carbonads .carbon-img:active {
  opacity: 0.8;
 }

-#carbonads a:hover {
-  text-decoration: underline;
-}
-
 #carbonads .carbon-text {
  display: block;
  color: #363636;
  line-height: 20px;
-  padding: 15px 15px 35px 160px;
+  min-height: 100px;
+  padding: 0 0 20px calc(130px + 1rem);
+}
+
+#carbonads .carbon-text:hover {
+  color: #3273dc;
 }

 #carbonads .carbon-poweredby {
-  bottom: 10px;
+  bottom: 0;
  color: #7a7a7a;
  display: inline;
  font-size: 0.75rem;
+  line-height: 20px;
  position: absolute;
-  right: 10px;
+  right: 0;
+}
+
+#carbonads .carbon-poweredby:hover {
+  text-decoration: underline;
 }

 .intro-content {
--- a/docs/documentation/form.html
+++ b/docs/documentation/form.html
@@ -0,0 +1,9 @@
+---
+title: Form
+subtitle: "All <strong>form controls</strong>"
+layout: documentation
+breadcrumb:
+- home
+- documentation
+- form
+---
--- a/docs/documentation/form/checkbox.html
+++ b/docs/documentation/form/checkbox.html
@@ -1,8 +1,18 @@
 ---
 title: Checkbox
+subtitle: "The 2-state <strong>checkbox</strong> in its native format"
 layout: documentation
 doc-tab: form
 doc-subtab: checkbox
+breadcrumb:
+- home
+- documentation
+- form
+- form-checkbox
+meta:
+  colors: false
+  sizes: false
+  variables: false
 ---

 {% capture checkbox_example %}
@@ -26,23 +36,6 @@ doc-subtab: checkbox
 </label>
 {% endcapture %}

-{% include subnav/subnav-form.html %}
-
-<section class="section">
-  <div class="container">
-    <h1 class="title">Checkbox</h1>
-    <h2 class="subtitle">
-      The 2-state <strong>checkbox</strong> in its native format
-    </h2>
-    {%
-      include meta.html
-      colors=false
-      sizes=false
-      variables=false
-    %}
-
-    <hr>
-
 <div class="content">
  <p>
    The <code>checkbox</code> class is a simple wrapper around the <code>&lt;input type="checkbox"&gt;</code> HTML element. It is intentionally not styled, to preserve cross-browser compatibility and the user experience.
@@ -81,5 +74,3 @@ doc-subtab: checkbox
    {% highlight html %}{{checkbox_disabled_example}}{% endhighlight %}
  </div>
 </div>
-  </div>
-</section>
--- a/docs/documentation/form/file.html
+++ b/docs/documentation/form/file.html
@@ -1,8 +1,14 @@
 ---
 title: File upload
+subtitle: "A custom <strong>file upload</strong> input, without JavaScript"
 layout: documentation
 doc-tab: form
 doc-subtab: file
+breadcrumb:
+- home
+- documentation
+- form
+- form-file
 file_name: "Screen Shot 2017-07-29 at 15.54.25.png"
 variables_keys:
 - file-border-color
@@ -15,6 +21,11 @@ variables_keys:
 - file-name-border-style
 - file-name-border-width
 - file-name-max-width
+meta:
+  experimental: true
+  colors: true
+  sizes: true
+  variables: true
 ---

 {% capture file %}
@@ -527,25 +538,6 @@ variables_keys:
 </div>
 {% endcapture %}

-{% include subnav/subnav-form.html %}
-
-<section class="section">
-  <div class="container">
-    <h1 class="title">File upload</h1>
-    <h2 class="subtitle">
-      A custom <strong>file upload</strong> input, without JavaScript
-    </h2>
-    {%
-      include meta.html
-      experimental=true
-      since="0.5.1"
-      colors=true
-      sizes=true
-      variables=true
-    %}
-
-    <hr>
-
 <div class="content">
  <p>
    The <code>.file</code> element is a simple <strong>interactive label</strong> that wraps an <code>&lt;input type="file"&gt;</code>. It comprises several sub-elements:
@@ -774,6 +766,3 @@ variables_keys:
    {% endfor %}
  </tbody>
 </table>
-
-  </div>
-</section>
--- a/docs/documentation/form/general.html
+++ b/docs/documentation/form/general.html
@@ -1,8 +1,14 @@
 ---
 title: Form controls
+subtitle: "All generic <strong>form controls</strong>, designed for consistency"
 layout: documentation
 doc-tab: form
 doc-subtab: general
+breadcrumb:
+- home
+- documentation
+- form
+- form-general
 variables_controls_keys:
 - control-radius
 - control-radius-small
@@ -795,17 +801,6 @@ variables_form_keys:
 </div>
 {% endcapture %}

-{% include subnav/subnav-form.html %}
-
-<section class="section">
-  <div class="container">
-    <h1 class="title">Form controls</h1>
-    <h2 class="subtitle">
-      All generic <strong>form controls</strong>, designed for consistency
-    </h2>
-
-    <hr>
-
 <div class="content">
  <p>The following form controls <strong>classes</strong> are supported:</p>
  <ul>
@@ -1081,6 +1076,3 @@ variables_form_keys:
    {% endfor %}
  </tbody>
 </table>
-
-  </div>
-</section>
--- a/docs/documentation/form/input.html
+++ b/docs/documentation/form/input.html
@@ -1,8 +1,14 @@
 ---
 title: Input
+subtitle: "The <strong>text input</strong> and its variations"
 layout: documentation
 doc-tab: form
 doc-subtab: input
+breadcrumb:
+- home
+- documentation
+- form
+- form-input
 variables_keys:
 - input-color
 - input-background-color
@@ -21,6 +27,10 @@ variables_keys:
 - input-icon-color
 - input-icon-active-color
 - input-radius
+meta:
+  colors: true
+  sizes: true
+  variables: true
 ---

 {% capture input_example %}
@@ -239,23 +249,6 @@ variables_keys:
 </div>
 {% endcapture %}

-{% include subnav/subnav-form.html %}
-
-<section class="section">
-  <div class="container">
-    <h1 class="title">Input</h1>
-    <h2 class="subtitle">
-      The <strong>text input</strong> and its variations
-    </h2>
-    {%
-      include meta.html
-      colors=true
-      sizes=true
-      variables=true
-    %}
-
-    <hr>
-
 <div class="content">
  <p>The following <strong>modifiers</strong> are supported:</p>
  <ul>
@@ -521,6 +514,3 @@ variables_keys:
    {% endfor %}
  </tbody>
 </table>
-
-  </div>
-</section>
--- a/docs/documentation/form/radio.html
+++ b/docs/documentation/form/radio.html
@@ -1,8 +1,18 @@
 ---
 title: Radio button
+subtitle: "The mutually exclusive <strong>radio buttons</strong> in their native format"
 layout: documentation
 doc-tab: form
 doc-subtab: radio
+breadcrumb:
+- home
+- documentation
+- form
+- form-radio
+meta:
+  colors: false
+  sizes: false
+  variables: false
 ---

 {% capture radio_example %}
@@ -48,23 +58,6 @@ doc-subtab: radio
 </div>
 {% endcapture %}

-{% include subnav/subnav-form.html %}
-
-<section class="section">
-  <div class="container">
-    <h1 class="title">Radio</h1>
-    <h2 class="subtitle">
-      The mutually exclusive <strong>radio buttons</strong> in their native format
-    </h2>
-    {%
-      include meta.html
-      colors=false
-      sizes=false
-      variables=false
-    %}
-
-    <hr>
-
 <div class="content">
  <p>
    The <code>radio</code> class is a simple wrapper around the <code>&lt;input type="radio"&gt;</code> HTML elements. It is intentionally not styled, to preserve cross-browser compatibility and the user experience.
@@ -112,5 +105,3 @@ doc-subtab: radio
    {% highlight html %}{{radio_disabled_example}}{% endhighlight %}
  </div>
 </div>
-  </div>
-</section>
--- a/docs/documentation/form/select.html
+++ b/docs/documentation/form/select.html
@@ -1,8 +1,18 @@
 ---
 title: Select
+subtitle: "The browser built-in <strong>select dropdown</strong>, styled accordingly"
 layout: documentation
 doc-tab: form
 doc-subtab: select
+breadcrumb:
+- home
+- documentation
+- form
+- form-select
+meta:
+  colors: true
+  sizes: true
+  variables: false
 ---

 {% capture select_example %}
@@ -270,23 +280,6 @@ doc-subtab: select
 </div>
 {% endcapture %}

-{% include subnav/subnav-form.html %}
-
-<section class="section">
-  <div class="container">
-    <h1 class="title">Select</h1>
-    <h2 class="subtitle">
-      The browser built-in <strong>select dropdown</strong>, styled accordingly
-    </h2>
-    {%
-      include meta.html
-      colors=true
-      sizes=true
-      variables=false
-    %}
-
-    <hr>
-
 <div class="content">
  <p>The following <strong>modifiers</strong> are supported:</p>
  <ul>
@@ -469,6 +462,3 @@ doc-subtab: select
    {% highlight html %}{{has_icons_large_example}}{% endhighlight %}
  </div>
 </div>
-
-  </div>
-</section>
--- a/docs/documentation/form/textarea.html
+++ b/docs/documentation/form/textarea.html
@@ -1,8 +1,18 @@
 ---
 title: Textarea
+subtitle: "The multiline <strong>textarea</strong> and its variations"
 layout: documentation
 doc-tab: form
 doc-subtab: textarea
+breadcrumb:
+- home
+- documentation
+- form
+- form-textarea
+meta:
+  colors: true
+  sizes: true
+  variables: false
 ---

 {% capture textarea_example %}
@@ -123,23 +133,6 @@ doc-subtab: textarea
 </div>
 {% endcapture %}

-{% include subnav/subnav-form.html %}
-
-<section class="section">
-  <div class="container">
-    <h1 class="title">Textarea</h1>
-    <h2 class="subtitle">
-      The multiline <strong>textarea</strong> and its variations
-    </h2>
-    {%
-      include meta.html
-      colors=true
-      sizes=true
-      variables=false
-    %}
-
-    <hr>
-
 {% include snippet.html content=textarea_example %}

 <div class="content">
@@ -208,6 +201,3 @@ doc-subtab: textarea
 </div>

 {% include snippet.html content=readonly_example %}
-
-  </div>
-</section>
--- a/docs/documentation/layout/container.html
+++ b/docs/documentation/layout/container.html
@@ -1,6 +1,8 @@
 ---
 title: Container
+subtitle: "A simple <strong>container</strong> to center your content horizontally"
 layout: documentation
+hide_carbon: true
 doc-tab: layout
 doc-subtab: container
 ---
@@ -38,17 +40,6 @@ doc-subtab: container
 </div>
 {% endcapture %}

-{% include subnav/subnav-layout.html %}
-
-<section class="section">
-  <div class="container">
-    <h1 class="title">Container</h1>
-    <h2 class="subtitle">
-      A simple <strong>container</strong> to center your content horizontally
-    </h2>
-
-    <hr>
-
 <div class="content">
  <p>The <code>.container</code> class can be used in any context, but mostly as a <strong>direct child</strong> of either:</p>
  <ul>
@@ -70,50 +61,56 @@ doc-subtab: container
  </ul>
  <p>The values <strong>960</strong>, <strong>1152</strong> and <strong>1344</strong> have been chosen because they are divisible by both <strong>12</strong> and <strong>16</strong>.</p>
 </div>
-  </div>
-</section>
+
+{% include layout/main-close.html show_carbon=true %}

 <div class="bd-example is-fullwidth">
  {{container_example}}
 </div>

+{% include layout/main-open.html %}
+
 {% highlight html %}{{ container_example }}{% endhighlight %}

-<section class="section">
-<div class="container">
 <h3 class="title is-4">Fluid container</h3>
 <div class="content">
  <p>If you don't want to have a maximum width but want to keep the 32px margin on the left and
     right sides, add the <code>is-fluid</code> modifier:</p>
 </div>
-</div>
-</section>
+
+{% include layout/main-close.html %}

 <div class="bd-example is-fullwidth">
  {{container_fluid_example}}
 </div>

+{% include layout/main-open.html %}
+
 {% highlight html %}{{ container_fluid_example }}{% endhighlight %}

-<section class="section">
-<div class="container">
 <h3 class="title is-4">Breakpoint containers</h3>
 <div class="content">
  <p>
    With the two modifiers <code>.is-widescreen</code> and <code>.is-fullhd</code>, you can have a <em>fullwidth</em> container <strong>until</strong> those specific breakpoints.
  </p>
 </div>
-</div>
-</section>
+
+{% include layout/main-close.html %}

 <div class="bd-example is-fullwidth">
  {{container_widescreen_example}}
 </div>

+{% include layout/main-open.html %}
+
 {% highlight html %}{{ container_widescreen_example }}{% endhighlight %}

+{% include layout/main-close.html %}
+
 <div class="bd-example is-fullwidth">
  {{ container_fullhd_example }}
 </div>

+{% include layout/main-open.html %}
+
 {% highlight html %}{{ container_fullhd_example }}{% endhighlight %}