Fix flex shrink

diff --git a/_config.yml b/_config.yml
index 51c8c14fd1547bcd054929c405a9fce00d2a5d27..9841c33718e5893553c96c9403e7b6e0498e42e5 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -14,7 +14,7 @@ url:           "http://bulma.io"
 # Variables
 
 baseurl:       ""
-cssurl:        "/styles/bulma-website.css"
+cssurl:        "/css/bulma-docs.css"
 documentation: "/documentation/overview/start/"
 download:      "https://github.com/jgthms/bulma/archive/0.1.2.zip"
 github:        "https://github.com/jgthms/bulma"

diff --git a/package.json b/package.json
index 160f22331e5983e2b0b88492996a0c86721d12e7..de90e659d94380ec30ce8010e9e33f2c71b68eaa 100644 (file)
--- a/package.json
+++ b/package.json
@@ -27,12 +27,16 @@
     "postcss-cli": "^2.5.1"
   },
   "scripts": {
-    "autoprefix": "postcss --use autoprefixer --output css/bulma.css css/bulma.css",
-    "build": "npm run clean && npm run build-sass && npm run autoprefix",
+    "build": "npm run build-clean && npm run build-sass && npm run build-autoprefix",
+    "build-autoprefix": "postcss --use autoprefixer --output css/bulma.css css/bulma.css",
+    "build-clean": "rm -rf css",
     "build-sass": "node-sass --output-style expanded --source-map true --output css/ bulma.sass --outFile css/bulma.css",
-    "clean": "rm -rf css",
+    "docs": "npm run docs-sass && npm run docs-autoprefix",
+    "docs-autoprefix": "postcss --use autoprefixer --output docs/css/bulma-docs.css docs/css/bulma-docs.css",
+    "docs-sass": "node-sass --output-style expanded --output docs/css/ docs/bulma-docs.sass --outFile docs/css/bulma-docs.css",
     "pre-push": "npm run build && git add css && git commit --amend --no-edit",
-    "start": "npm run build-sass -- --watch"
+    "start": "npm run build-sass -- --watch",
+    "start-docs": "npm run docs-sass -- --watch"
   },
   "files": [
     "css",

diff --git a/sass/components/media.sass b/sass/components/media.sass
index 0630ea96c4002220530512304c984019fce2f1b0..5d3cd00264dded4daab294e6dcbd4688476c84b2 100644 (file)
--- a/sass/components/media.sass
+++ b/sass/components/media.sass
@@ -23,7 +23,7 @@
 
 .media-content
   flex-grow: 1
-  flex-shrink: 0
+  flex-shrink: 1
   text-align: left
 
 .media

diff --git a/sass/components/modal.sass b/sass/components/modal.sass
index 65857e9ef926f49503948ffc67dec0be6dbf950e..a032977362e64bf0d07f2cbf074cddc4e87a3251 100644 (file)
--- a/sass/components/modal.sass
+++ b/sass/components/modal.sass
@@ -25,8 +25,6 @@
 
 .modal-card
   @extend .modal-content
-  background-color: $white
-  border-radius: $radius-large
   display: flex
   flex-direction: column
   max-height: calc(100vh - 40px)
@@ -44,6 +42,8 @@
 
 .modal-card-head
   border-bottom: 1px solid $border
+  border-top-left-radius: $radius-large
+  border-top-right-radius: $radius-large
 
 .modal-card-title
   color: $text-strong
@@ -53,14 +53,17 @@
   line-height: 1
 
 .modal-card-foot
+  border-bottom-left-radius: $radius-large
+  border-bottom-right-radius: $radius-large
   border-top: 1px solid $border
   .button
     &:not(:last-child)
       margin-right: 10px
 
 .modal-card-body
+  background-color: $white
   flex-grow: 1
-  flex-shrink: 0
+  flex-shrink: 1
   overflow: auto
   padding: 20px
 

diff --git a/sass/elements/form.sass b/sass/elements/form.sass
index 7b69cba48ee213cfc44b805e7e7cbe8ad3c64ad5..b4518b2b2fe49cf75cc69006889afb24a11ae292 100644 (file)
--- a/sass/elements/form.sass
+++ b/sass/elements/form.sass
@@ -127,6 +127,7 @@
   +mobile
     margin-bottom: 5px
   +tablet
+    flex-basis: 0
     flex-grow: 1
     flex-shrink: 0
     margin-right: 20px
@@ -247,8 +248,9 @@
       display: flex
       & > .control
         display: flex
+        flex-basis: 0
         flex-grow: 5
-        flex-shrink: 0
+        flex-shrink: 1
   &.is-loading
     &:after
       @extend .loader