From: Jeremy Thomas Date: Sat, 10 Sep 2016 20:52:27 +0000 (+0100) Subject: Add flex shrink X-Git-Tag: 0.2.1~14^2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d9a51cf48b6d64c4f22a63f6794413facadc013;p=thirdparty%2Fbulma.git Add flex shrink --- diff --git a/sass/components/media.sass b/sass/components/media.sass index cf36578f5..0630ea96c 100644 --- a/sass/components/media.sass +++ b/sass/components/media.sass @@ -23,6 +23,7 @@ .media-content flex-grow: 1 + flex-shrink: 0 text-align: left .media diff --git a/sass/components/modal.sass b/sass/components/modal.sass index a54a75291..65857e9ef 100644 --- a/sass/components/modal.sass +++ b/sass/components/modal.sass @@ -48,6 +48,7 @@ .modal-card-title color: $text-strong flex-grow: 1 + flex-shrink: 0 font-size: $size-4 line-height: 1 @@ -59,6 +60,7 @@ .modal-card-body flex-grow: 1 + flex-shrink: 0 overflow: auto padding: 20px diff --git a/sass/components/nav.sass b/sass/components/nav.sass index 1523d8144..c8b280345 100644 --- a/sass/components/nav.sass +++ b/sass/components/nav.sass @@ -13,6 +13,7 @@ padding: 10px a flex-grow: 1 + flex-shrink: 0 img max-height: 24px .button + .button @@ -72,6 +73,7 @@ a.nav-item display: flex flex-basis: 0 flex-grow: 1 + flex-shrink: 0 justify-content: flex-start overflow: hidden overflow-x: auto @@ -91,6 +93,7 @@ a.nav-item display: flex flex-basis: 0 flex-grow: 1 + flex-shrink: 0 justify-content: flex-end // Main container diff --git a/sass/components/pagination.sass b/sass/components/pagination.sass index a595c484f..63cddc116 100644 --- a/sass/components/pagination.sass +++ b/sass/components/pagination.sass @@ -17,6 +17,7 @@ align-items: center display: flex flex-grow: 1 + flex-shrink: 0 justify-content: center // Responsiveness +mobile @@ -27,6 +28,7 @@ margin-left: 10px li flex-grow: 1 + flex-shrink: 0 ul margin-top: 10px +tablet diff --git a/sass/components/tabs.sass b/sass/components/tabs.sass index 5d17df37e..b676dee62 100644 --- a/sass/components/tabs.sass +++ b/sass/components/tabs.sass @@ -31,6 +31,7 @@ border-bottom: 1px solid $border display: flex flex-grow: 1 + flex-shrink: 0 justify-content: flex-start &.is-left padding-right: 10px @@ -73,6 +74,7 @@ &.is-fullwidth li flex-grow: 1 + flex-shrink: 0 &.is-toggle a border: 1px solid $border diff --git a/sass/elements/form.sass b/sass/elements/form.sass index 6ebbb1566..7b69cba48 100644 --- a/sass/elements/form.sass +++ b/sass/elements/form.sass @@ -128,6 +128,7 @@ margin-bottom: 5px +tablet flex-grow: 1 + flex-shrink: 0 margin-right: 20px padding-top: 7px text-align: right @@ -162,6 +163,7 @@ border-radius: 0 $radius $radius 0 &.is-expanded flex-grow: 1 + flex-shrink: 0 &.has-addons-centered justify-content: center &.has-addons-right @@ -171,6 +173,7 @@ .input, .select flex-grow: 1 + flex-shrink: 0 &.has-icon & > .fa +fa(14px, 24px) @@ -234,6 +237,7 @@ margin-right: 10px &.is-expanded flex-grow: 1 + flex-shrink: 0 &.is-grouped-centered justify-content: center &.is-grouped-right @@ -244,6 +248,7 @@ & > .control display: flex flex-grow: 5 + flex-shrink: 0 &.is-loading &:after @extend .loader diff --git a/sass/layout/hero.sass b/sass/layout/hero.sass index 1ab13ed07..380241ab5 100644 --- a/sass/layout/hero.sass +++ b/sass/layout/hero.sass @@ -39,9 +39,10 @@ .hero-body flex-grow: 1 + flex-shrink: 0 padding: 40px 20px // Responsiveness - +desktop + +widescreen padding-left: 0 padding-right: 0 @@ -144,3 +145,4 @@ display: flex & > .container flex-grow: 1 + flex-shrink: 0