浏览代码

Remove flex shorthand

jgthms 9 年之前
父节点
当前提交
d7379e8b22

+ 4 - 0
CHANGELOG.md

@@ -1,5 +1,9 @@
 # Bulma Changelog
 # Bulma Changelog
 
 
+## 0.1.1
+
+* Remove `flex: 1` shorthand
+
 ## 0.1.0
 ## 0.1.0
 
 
 * Fix #227
 * Fix #227

+ 2 - 2
sass/components/card.sass

@@ -8,7 +8,7 @@
   align-items: flex-start
   align-items: flex-start
   color: $text-strong
   color: $text-strong
   display: flex
   display: flex
-  flex: 1
+  flex-grow: 1
   font-weight: bold
   font-weight: bold
   padding: 10px
   padding: 10px
 
 
@@ -36,7 +36,7 @@
 .card-footer-item
 .card-footer-item
   align-items: center
   align-items: center
   display: flex
   display: flex
-  flex: 1
+  flex-grow: 1
   justify-content: center
   justify-content: center
   padding: 10px
   padding: 10px
   &:not(:last-child)
   &:not(:last-child)

+ 6 - 3
sass/components/grid.sass

@@ -1,5 +1,7 @@
 .column
 .column
-  flex: 1 1 auto
+  flex-basis: 0
+  flex-grow: 1
+  flex-shrink: 1
   padding: 10px
   padding: 10px
   .columns.is-mobile > &.is-narrow
   .columns.is-mobile > &.is-narrow
     flex: none
     flex: none
@@ -227,7 +229,6 @@
     +tablet
     +tablet
       flex-wrap: wrap
       flex-wrap: wrap
       & > .column
       & > .column
-        flex-basis: 33.3333%
         max-width: 33.3333%
         max-width: 33.3333%
         padding: 10px
         padding: 10px
         width: 33.3333%
         width: 33.3333%
@@ -250,7 +251,9 @@
 
 
 .tile
 .tile
   align-items: stretch
   align-items: stretch
-  flex: 1 1 auto
+  flex-basis: 0
+  flex-grow: 1
+  flex-shrink: 1
   min-height: min-content
   min-height: min-content
   // Modifiers
   // Modifiers
   &.is-ancestor
   &.is-ancestor

+ 3 - 3
sass/components/level.sass

@@ -14,7 +14,7 @@
       margin-right: 10px
       margin-right: 10px
     // Modifiers
     // Modifiers
     &.is-flexible
     &.is-flexible
-      flex: 1
+      flex-grow: 1
 
 
 .level-left
 .level-left
   // Responsiveness
   // Responsiveness
@@ -48,10 +48,10 @@
       &:not(:last-child)
       &:not(:last-child)
         margin-bottom: 0
         margin-bottom: 0
       &:not(.is-narrow)
       &:not(.is-narrow)
-        flex: 1
+        flex-grow: 1
   // Responsiveness
   // Responsiveness
   +tablet
   +tablet
     display: flex
     display: flex
     & > .level-item
     & > .level-item
       &:not(.is-narrow)
       &:not(.is-narrow)
-        flex: 1
+        flex-grow: 1

+ 1 - 1
sass/components/media.sass

@@ -22,7 +22,7 @@
   margin-left: 10px
   margin-left: 10px
 
 
 .media-content
 .media-content
-  flex: 1
+  flex-grow: 1
   text-align: left
   text-align: left
 
 
 .media
 .media

+ 2 - 2
sass/components/modal.sass

@@ -47,7 +47,7 @@
 
 
 .modal-card-title
 .modal-card-title
   color: $text-strong
   color: $text-strong
-  flex: 1
+  flex-grow: 1
   font-size: $size-4
   font-size: $size-4
   line-height: 1
   line-height: 1
 
 
@@ -58,7 +58,7 @@
       margin-right: 10px
       margin-right: 10px
 
 
 .modal-card-body
 .modal-card-body
-  flex: 1
+  flex-grow: 1
   overflow: auto
   overflow: auto
   padding: 20px
   padding: 20px
 
 

+ 6 - 2
sass/components/nav.sass

@@ -68,7 +68,8 @@ a.nav-item
 .nav-left
 .nav-left
   align-items: stretch
   align-items: stretch
   display: flex
   display: flex
-  flex: 1
+  flex-basis: 0
+  flex-grow: 1
   justify-content: flex-start
   justify-content: flex-start
   overflow: hidden
   overflow: hidden
   overflow-x: auto
   overflow-x: auto
@@ -78,13 +79,16 @@ a.nav-item
   align-items: stretch
   align-items: stretch
   display: flex
   display: flex
   justify-content: center
   justify-content: center
+  margin-left: auto
+  margin-right: auto
 
 
 .nav-right
 .nav-right
   // Responsiveness
   // Responsiveness
   +tablet
   +tablet
     align-items: stretch
     align-items: stretch
     display: flex
     display: flex
-    flex: 1
+    flex-basis: 0
+    flex-grow: 1
     justify-content: flex-end
     justify-content: flex-end
 
 
 // Main container
 // Main container

+ 3 - 3
sass/components/navbar.sass

@@ -14,7 +14,7 @@
       margin-right: 10px
       margin-right: 10px
     // Modifiers
     // Modifiers
     &.is-flexible
     &.is-flexible
-      flex: 1
+      flex-grow: 1
 
 
 .navbar-left
 .navbar-left
   // Responsiveness
   // Responsiveness
@@ -48,10 +48,10 @@
       &:not(:last-child)
       &:not(:last-child)
         margin-bottom: 0
         margin-bottom: 0
       &:not(.is-narrow)
       &:not(.is-narrow)
-        flex: 1
+        flex-grow: 1
   // Responsiveness
   // Responsiveness
   +tablet
   +tablet
     display: flex
     display: flex
     & > .navbar-item
     & > .navbar-item
       &:not(.is-narrow)
       &:not(.is-narrow)
-        flex: 1
+        flex-grow: 1

+ 2 - 2
sass/components/pagination.sass

@@ -16,7 +16,7 @@
   ul
   ul
     align-items: center
     align-items: center
     display: flex
     display: flex
-    flex: 1
+    flex-grow: 1
     justify-content: center
     justify-content: center
   // Responsiveness
   // Responsiveness
   +mobile
   +mobile
@@ -26,7 +26,7 @@
       &:not(:first-child)
       &:not(:first-child)
         margin-left: 10px
         margin-left: 10px
     li
     li
-      flex: 1
+      flex-grow: 1
     ul
     ul
       margin-top: 10px
       margin-top: 10px
   +tablet
   +tablet

+ 2 - 2
sass/components/tabs.sass

@@ -30,7 +30,7 @@
     align-items: center
     align-items: center
     border-bottom: 1px solid $border
     border-bottom: 1px solid $border
     display: flex
     display: flex
-    flex: 1
+    flex-grow: 1
     justify-content: flex-start
     justify-content: flex-start
     &.is-left
     &.is-left
       padding-right: 10px
       padding-right: 10px
@@ -72,7 +72,7 @@
           border-bottom-color: transparent !important
           border-bottom-color: transparent !important
   &.is-fullwidth
   &.is-fullwidth
     li
     li
-      flex: 1
+      flex-grow: 1
   &.is-toggle
   &.is-toggle
     a
     a
       border: 1px solid $border
       border: 1px solid $border

+ 5 - 5
sass/elements/form.sass

@@ -127,7 +127,7 @@
   +mobile
   +mobile
     margin-bottom: 5px
     margin-bottom: 5px
   +tablet
   +tablet
-    flex: 1
+    flex-grow: 1
     margin-right: 20px
     margin-right: 20px
     padding-top: 7px
     padding-top: 7px
     text-align: right
     text-align: right
@@ -161,7 +161,7 @@
         select
         select
           border-radius: 0 $radius $radius 0
           border-radius: 0 $radius $radius 0
       &.is-expanded
       &.is-expanded
-        flex: 1
+        flex-grow: 1
     &.has-addons-centered
     &.has-addons-centered
       justify-content: center
       justify-content: center
     &.has-addons-right
     &.has-addons-right
@@ -170,7 +170,7 @@
       .button,
       .button,
       .input,
       .input,
       .select
       .select
-        flex: 1
+        flex-grow: 1
   &.has-icon
   &.has-icon
     & > .fa
     & > .fa
       +fa(14px, 24px)
       +fa(14px, 24px)
@@ -233,7 +233,7 @@
         margin-bottom: 0
         margin-bottom: 0
         margin-right: 10px
         margin-right: 10px
       &.is-expanded
       &.is-expanded
-        flex: 1
+        flex-grow: 1
     &.is-grouped-centered
     &.is-grouped-centered
       justify-content: center
       justify-content: center
     &.is-grouped-right
     &.is-grouped-right
@@ -243,7 +243,7 @@
       display: flex
       display: flex
       & > .control
       & > .control
         display: flex
         display: flex
-        flex: 5
+        flex-grow: 5
   &.is-loading
   &.is-loading
     &:after
     &:after
       @extend .loader
       @extend .loader

+ 2 - 2
sass/layout/header.sass

@@ -86,7 +86,7 @@ a.header-item
 .header-left
 .header-left
   align-items: stretch
   align-items: stretch
   display: flex
   display: flex
-  flex: 1
+  flex-grow: 1
   overflow: hidden
   overflow: hidden
   overflow-x: auto
   overflow-x: auto
   white-space: nowrap
   white-space: nowrap
@@ -113,7 +113,7 @@ a.header-item
   & > .header-item
   & > .header-item
     align-items: stretch
     align-items: stretch
     display: flex
     display: flex
-    flex: 1
+    flex-grow: 1
     justify-content: center
     justify-content: center
     padding: 0
     padding: 0
     & > a
     & > a

+ 2 - 2
sass/layout/hero.sass

@@ -38,7 +38,7 @@
   flex-shrink: 0
   flex-shrink: 0
 
 
 .hero-body
 .hero-body
-  flex: 1
+  flex-grow: 1
   padding: 40px 20px
   padding: 40px 20px
   // Responsiveness
   // Responsiveness
   +desktop
   +desktop
@@ -143,4 +143,4 @@
       align-items: center
       align-items: center
       display: flex
       display: flex
       & > .container
       & > .container
-        flex: 1
+        flex-grow: 1