Skip to content

Commit

Permalink
Merge branch 'master' into docs-dark-mode
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Dec 25, 2019
2 parents 26871c8 + 74e45eb commit c779e4a
Show file tree
Hide file tree
Showing 100 changed files with 2,925 additions and 1,694 deletions.
23 changes: 15 additions & 8 deletions .github/workflows/test.yml
Expand Up @@ -15,9 +15,7 @@ jobs:

steps:
- name: Clone repository
uses: actions/checkout@v1
with:
fetch-depth: 3
uses: actions/checkout@v2

- name: Set Node.js version
uses: actions/setup-node@v1
Expand All @@ -28,6 +26,15 @@ jobs:
- run: npm --version
- run: java -version

- name: Set up npm cache
uses: actions/cache@v1
with:
path: ~/.npm
key: ${{ runner.os }}-node-v${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}-${{ hashFiles('.github/workflows/test.yml') }}
restore-keys: |
${{ runner.OS }}-node-v${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}-${{ hashFiles('.github/workflows/test.yml') }}
${{ runner.OS }}-node-v${{ matrix.node }}-
- name: Install npm dependencies
run: npm ci

Expand All @@ -48,8 +55,8 @@ jobs:
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 }}"
COVERALLS_GIT_BRANCH: "${{ github.ref }}"
uses: coverallsapp/github-action@master
if: matrix.node == 10
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
path-to-lcov: "./js/coverage/lcov.info"
4 changes: 2 additions & 2 deletions .stylelintrc
Expand Up @@ -12,10 +12,10 @@
"transition"
],
"function-blacklist": ["calc"],
'scss/dollar-variable-default': [
"scss/dollar-variable-default": [
true,
{
'ignore': 'local'
"ignore": "local"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -192,7 +192,7 @@ Thanks to [BrowserStack](https://www.browserstack.com/) for providing the infras

Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/bootstrap#backer)]

[![Bakers](https://opencollective.com/bootstrap/backers.svg?width=890)](https://opencollective.com/bootstrap#backers)
[![Backers](https://opencollective.com/bootstrap/backers.svg?width=890)](https://opencollective.com/bootstrap#backers)


## Sponsors
Expand Down
1 change: 1 addition & 0 deletions build/change-version.js
Expand Up @@ -102,6 +102,7 @@ function main(args) {
'.js',
'.json',
'.md',
'.nuspec',
'.scss',
'.txt',
'.yml'
Expand Down
14 changes: 9 additions & 5 deletions config.yml
Expand Up @@ -3,9 +3,12 @@ title: "Bootstrap"
baseURL: "https://getbootstrap.com"
enableInlineShortcodes: true

pygmentsUseClasses: true
# you can use ```lang if you want too
pygmentsCodeFences: true
markup:
goldmark:
renderer:
unsafe: true
highlight:
noClasses: false

buildDrafts: true
buildFuture: true
Expand Down Expand Up @@ -46,6 +49,7 @@ params:

current_version: "4.3.1"
current_ruby_version: "4.3.1"
rfs_version: "9.0.2"
docs_version: "4.3"
repo: "https://github.com/twbs/bootstrap"
twitter: "getbootstrap"
Expand All @@ -68,5 +72,5 @@ params:
js_hash: "sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
js_bundle: "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.bundle.min.js"
js_bundle_hash: "sha384-xrRywqdh3PHs8keKZN+8zzc5TX0GRTLCcmivcbNJWm2rs5C8PRhcEn3czEjhAO9o"
popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.15.0/umd/popper.min.js"
popper_hash: "sha384-L2pyEeut/H3mtgCBaUNw7KWzp5n9+4pDQiExs933/5QfaTh8YStYFFkOzSoXjlTb"
popper: "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
popper_hash: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-reboot.css.map

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions dist/css/bootstrap-utilities.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-utilities.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-utilities.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-utilities.min.css.map

Large diffs are not rendered by default.

83 changes: 30 additions & 53 deletions dist/css/bootstrap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css.map

Large diffs are not rendered by default.

0 comments on commit c779e4a

Please sign in to comment.