Merge branch 'master' into master-xmr-us-locale

twbs · Aug 14, 2019 · 1920ed7 · 1920ed7
2 parents a01840c + 7149b6f
commit 1920ed7
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 32 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,50 @@
+name: Run tests
+on: [push, pull_request]
+
+jobs:
+  run:
+    name: Node ${{ matrix.node }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node: [8, 10, 12]
+
+    steps:
+      - uses: actions/checkout@master
+        with:
+          fetch-depth: 3
+
+      - name: Set Node.js version
+        uses: actions/[email protected]
+        with:
+          version: ${{ matrix.node }}
+
+      - run: node --version
+      - run: npm --version
+      - run: java -version
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: Run tests
+        run: npm test
+
+      - name: Run bundlesize
+        run: npm run bundlesize
+        if: matrix.node == 10 && github.repository == 'twbs/bootstrap' && github.event_name == 'push'
+        env:
+          BUNDLESIZE_GITHUB_TOKEN: "${{ secrets.BUNDLESIZE_GITHUB_TOKEN }}"
+
+      - name: Run BrowserStack tests
+        run: npm run js-test-cloud
+        if: matrix.node == 10 && github.repository == 'twbs/bootstrap' && github.event_name == 'push'
+        env:
+          BROWSER_STACK_ACCESS_KEY: "${{ secrets.BROWSER_STACK_ACCESS_KEY }}"
+          BROWSER_STACK_USERNAME: "${{ secrets.BROWSER_STACK_USERNAME }}"
+
+      - name: Run Coveralls
+        run: npm run coveralls
+        if: matrix.node == 10 && github.repository == 'twbs/bootstrap' && github.event_name == 'push'
+        env:
+          COVERALLS_REPO_TOKEN: "${{ secrets.COVERALLS_REPO_TOKEN }}"
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ Read the [Getting started page](https://getbootstrap.com/docs/4.3/getting-starte
 
 ## Status
 
-[![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg)](https://travis-ci.org/twbs/bootstrap)
+![Build Status](https://action-badges.now.sh/twbs/bootstrap)
 [![npm version](https://img.shields.io/npm/v/bootstrap.svg)](https://www.npmjs.com/package/bootstrap)
 [![Gem version](https://img.shields.io/gem/v/bootstrap.svg)](https://rubygems.org/gems/bootstrap)
 [![Meteor Atmosphere](https://img.shields.io/badge/meteor-twbs%3Abootstrap-blue.svg)](https://atmospherejs.com/twbs/bootstrap)

diff --git a/bundlesize.config.json b/bundlesize.config.json
@@ -2,11 +2,11 @@
   "files": [
     {
       "path": "./dist/css/bootstrap-grid.css",
-      "maxSize": "8 kB"
+      "maxSize": "6.5 kB"
     },
     {
       "path": "./dist/css/bootstrap-grid.min.css",
-      "maxSize": "7.2 kB"
+      "maxSize": "6 kB"
     },
     {
       "path": "./dist/css/bootstrap-reboot.css",

diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "release-version": "node build/change-version.js",
     "release-zip": "cross-env-shell \"shx rm -rf bootstrap-$npm_package_version-dist && shx cp -r dist/ bootstrap-$npm_package_version-dist && zip -r9 bootstrap-$npm_package_version-dist.zip bootstrap-$npm_package_version-dist && shx rm -rf bootstrap-$npm_package_version-dist\"",
     "dist": "npm-run-all --parallel css js",
-    "test": "npm-run-all lint dist js-test docs-build docs-lint bundlesize",
+    "test": "npm-run-all lint dist js-test docs-build docs-lint",
     "netlify": "npm-run-all dist release-sri docs-production",
     "watch": "npm-run-all --parallel watch-*",
     "watch-css-main": "nodemon --watch scss/ --ext scss --exec \"npm run css-main\"",

diff --git a/scss/_functions.scss b/scss/_functions.scss
@@ -50,7 +50,7 @@
       $result: map-merge($result, ($key: $value));
     }
   }
-  @return $map;
+  @return $result;
 }
 
 // Replace `$search` with `$replace` in `$string`

diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -671,7 +671,7 @@ $form-feedback-invalid-color:       $danger !default;
 $form-feedback-icon-valid-color:    $form-feedback-valid-color !default;
 $form-feedback-icon-valid:          url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'><path fill='#{$form-feedback-icon-valid-color}' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/></svg>") !default;
 $form-feedback-icon-invalid-color:  $form-feedback-invalid-color !default;
-$form-feedback-icon-invalid:        url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='#{$form-feedback-icon-invalid-color}' viewBox='0 0 12 12'><circle cx='6' cy='6' r='4.5'/><path stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/><circle cx='6' cy='8.2' r='.1'/></svg>") !default;
+$form-feedback-icon-invalid:        url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='#{$form-feedback-icon-invalid-color}' viewBox='0 0 12 12'><circle cx='6' cy='6' r='4.5'/><path stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/><circle cx='6' cy='8.2' r='.6' fill='#{$form-feedback-icon-invalid-color}' stroke='none'/></svg>") !default;
 
 $form-validation-states: () !default;
 // stylelint-disable-next-line scss/dollar-variable-default

diff --git a/site/layouts/partials/header.html b/site/layouts/partials/header.html
@@ -1,6 +1,6 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="description" content="{{ index .Page.Params "description" | default .Site.Params.description | markdownify }}">
+<meta name="description" content="{{ .Page.Params.description | default .Site.Params.description | markdownify }}">
 <meta name="author" content="{{ .Site.Params.authors }}">
 <meta name="generator" content="Hugo {{ hugo.Version }}">
 

diff --git a/site/layouts/partials/social.html b/site/layouts/partials/social.html
@@ -3,16 +3,16 @@
 <meta name="twitter:site" content="@{{ .Site.Params.twitter }}">
 <meta name="twitter:creator" content="@{{ .Site.Params.twitter }}">
 <meta name="twitter:title" content="{{ .Title | markdownify }}">
-<meta name="twitter:description" content="{{ index .Page.Params "description" | default .Site.Params.description | markdownify }}">
-<meta name="twitter:image" content="{{ if .IsHome }}{{ .Site.BaseURL }}{{ .Site.Params.social_logo_path }}{{ else }}{{ .Site.BaseURL }}{{ .Site.Params.social_image_path }}{{ end }}">
+<meta name="twitter:description" content="{{ .Page.Params.description | default .Site.Params.description | markdownify }}">
+<meta name="twitter:image" content="{{ if .IsHome }}{{ .Site.Params.social_logo_path | absURL }}{{ else }}{{ .Site.Params.social_image_path | absURL }}{{ end }}">
 
 {{ "<!-- Facebook -->" | safeHTML }}
 <meta property="og:url" content="{{ .Permalink }}">
 <meta property="og:title" content="{{ .Title | markdownify }}">
-<meta property="og:description" content="{{ index .Page.Params "description" | default .Site.Params.description | markdownify }}">
+<meta property="og:description" content="{{ .Page.Params.description | default .Site.Params.description | markdownify }}">
 <meta property="og:type" content="website">
-<meta property="og:image" content="{{ replace .Site.BaseURL "https://" "http://" }}{{ .Site.Params.social_image_path }}">
-<meta property="og:image:secure_url" content="{{ .Site.BaseURL }}{{ .Site.Params.social_image_path }}">
+<meta property="og:image" content="{{ replace (.Site.Params.social_image_path | absURL) "https://" "http://" }}">
+<meta property="og:image:secure_url" content="{{ .Site.Params.social_image_path | absURL }}">
 <meta property="og:image:type" content="image/png">
 <meta property="og:image:width" content="1200">
 <meta property="og:image:height" content="630">
diff --git a/site/layouts/robots.txt b/site/layouts/robots.txt
@@ -9,4 +9,4 @@
 {{- end }}
 User-agent: *
 Disallow:{{ if not $allowCrawling }} /{{ end }}
-Sitemap: {{ .Site.BaseURL }}/sitemap.xml
+Sitemap: {{ "/sitemap.xml" | absURL }}