From a9e19cb89ed08689dc58c92b3d5491318a703f0e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 22 Aug 2020 19:40:57 +0200 Subject: composer update bootstrap --- vendor/twbs/bootstrap/.github/CONTRIBUTING.md | 16 ++-- .../twbs/bootstrap/.github/ISSUE_TEMPLATE/bug.md | 11 --- .../bootstrap/.github/ISSUE_TEMPLATE/bug_report.md | 13 ++-- .../bootstrap/.github/ISSUE_TEMPLATE/feature.md | 9 --- .../.github/ISSUE_TEMPLATE/feature_request.md | 5 +- vendor/twbs/bootstrap/.github/workflows/test.yml | 88 ---------------------- 6 files changed, 20 insertions(+), 122 deletions(-) delete mode 100644 vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/bug.md delete mode 100644 vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/feature.md delete mode 100644 vendor/twbs/bootstrap/.github/workflows/test.yml (limited to 'vendor/twbs/bootstrap/.github') diff --git a/vendor/twbs/bootstrap/.github/CONTRIBUTING.md b/vendor/twbs/bootstrap/.github/CONTRIBUTING.md index 6cd59b59b..2519be0d8 100644 --- a/vendor/twbs/bootstrap/.github/CONTRIBUTING.md +++ b/vendor/twbs/bootstrap/.github/CONTRIBUTING.md @@ -65,7 +65,7 @@ Guidelines for bug reports: reported. 2. **Check if the issue has been fixed** — try to reproduce it using the - latest `master` or development branch in the repository. + latest `master` or `v4-dev` branch in the repository. 3. **Isolate the problem** — ideally create a [reduced test case](https://css-tricks.com/reduced-test-cases/) and a live example. @@ -135,12 +135,12 @@ project (indentation, accurate comments, etc.) and any other requirements **Do not edit `bootstrap.css`, or `bootstrap.js` directly!** Those files are automatically generated. You should edit the -source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/master/scss) -and/or [`/bootstrap/js/src/`](https://github.com/twbs/bootstrap/tree/master/js/src) instead. +source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/v4-dev/scss) +and/or [`/bootstrap/js/src/`](https://github.com/twbs/bootstrap/tree/v4-dev/js/src) instead. Similarly, when contributing to Bootstrap's documentation, you should edit the documentation source files in -[the `/bootstrap/site/docs/` directory of the `master` branch](https://github.com/twbs/bootstrap/tree/master/site/docs). +[the `/bootstrap/site/docs/` directory of the `v4-dev` branch](https://github.com/twbs/bootstrap/tree/v4-dev/site/docs). **Do not edit the `gh-pages` branch.** That branch is generated from the documentation source files and is managed separately by the Bootstrap Core Team. @@ -162,8 +162,8 @@ included in the project: 2. If you cloned a while ago, get the latest changes from upstream: ```bash - git checkout master - git pull upstream master + git checkout v4-dev + git pull upstream v4-dev ``` 3. Create a new topic branch (off the main project development branch) to @@ -182,7 +182,7 @@ included in the project: 5. Locally merge (or rebase) the upstream development branch into your topic branch: ```bash - git pull [--rebase] upstream master + git pull [--rebase] upstream v4-dev ``` 6. Push your topic branch up to your fork: @@ -192,7 +192,7 @@ included in the project: ``` 7. [Open a Pull Request](https://help.github.com/articles/about-pull-requests/) - with a clear title and description against the `master` branch. + with a clear title and description against the `v4-dev` branch. **IMPORTANT**: By submitting a patch, you agree to allow the project owners to license your work under the terms of the [MIT License](../LICENSE) (if it diff --git a/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/bug.md b/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/bug.md deleted file mode 100644 index 8971d44ad..000000000 --- a/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/bug.md +++ /dev/null @@ -1,11 +0,0 @@ -Before opening: - -- [Search for duplicate or closed issues](https://github.com/twbs/bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue) -- [Validate](https://html5.validator.nu/) and [lint](https://github.com/twbs/bootlint#in-the-browser) any HTML to avoid common problems -- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/.github/CONTRIBUTING.md) - -Bug reports must include: - -- Operating system and version (Windows, macOS, Android, iOS, Win10 Mobile) -- Browser and version (Chrome, Firefox, Safari, IE, MS Edge, Opera 15+, Android Browser) -- [Reduced test case](https://css-tricks.com/reduced-test-cases/) and suggested fix using [CodePen](https://codepen.io/) or [JS Bin](https://jsbin.com/) diff --git a/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/bug_report.md b/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/bug_report.md index 2d77bb50e..4899d4de2 100644 --- a/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/bug_report.md +++ b/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,17 +1,20 @@ --- name: Bug report about: Tell us about a bug you may have identified in Bootstrap. +title: '' +labels: '' +assignees: '' --- Before opening: - [Search for duplicate or closed issues](https://github.com/twbs/bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue) -- [Validate](https://html5.validator.nu/) and [lint](https://github.com/twbs/bootlint#in-the-browser) any HTML to avoid common problems -- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/.github/CONTRIBUTING.md) +- [Validate](https://html5.validator.nu/) any HTML to avoid common problems +- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/v4-dev/.github/CONTRIBUTING.md) Bug reports must include: -- Operating system and version (Windows, macOS, Android, iOS, Win10 Mobile) -- Browser and version (Chrome, Firefox, Safari, IE, MS Edge, Opera 15+, Android Browser) -- [Reduced test case](https://css-tricks.com/reduced-test-cases/) and suggested fix using [CodePen](https://codepen.io/) or [JS Bin](https://jsbin.com/) +- Operating system and version (Windows, macOS, Android, iOS) +- Browser and version (Chrome, Firefox, Safari, Internet Explorer, Microsoft Edge, Opera, Android Browser) +- A [reduced test case](https://css-tricks.com/reduced-test-cases/) or suggested fix using [CodePen](https://codepen.io/) or [JS Bin](https://jsbin.com/) diff --git a/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/feature.md b/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/feature.md deleted file mode 100644 index 4c13c86a5..000000000 --- a/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/feature.md +++ /dev/null @@ -1,9 +0,0 @@ -Before opening: - -- [Search for duplicate or closed issues](https://github.com/twbs/bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue) -- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/.github/CONTRIBUTING.md) - -Feature requests must include: - -- As much detail as possible for what we should add and why it's important to Bootstrap -- Relevant links to prior art, screenshots, or live demos whenever possible diff --git a/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/feature_request.md b/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/feature_request.md index ed71d397d..db44076d9 100644 --- a/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/feature_request.md +++ b/vendor/twbs/bootstrap/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,13 +1,16 @@ --- name: Feature request about: Suggest an idea for a new feature in Bootstrap. +title: '' +labels: feature +assignees: '' --- Before opening: - [Search for duplicate or closed issues](https://github.com/twbs/bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue) -- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/.github/CONTRIBUTING.md) +- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/v4-dev/.github/CONTRIBUTING.md) Feature requests must include: diff --git a/vendor/twbs/bootstrap/.github/workflows/test.yml b/vendor/twbs/bootstrap/.github/workflows/test.yml deleted file mode 100644 index 0aac36a6b..000000000 --- a/vendor/twbs/bootstrap/.github/workflows/test.yml +++ /dev/null @@ -1,88 +0,0 @@ -name: Tests -on: [push, pull_request] -env: - CI: true - -jobs: - run: - name: Node ${{ matrix.node }} - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - node: [10, 12] - ruby: [2.6.x] - - steps: - - name: Clone repository - uses: actions/checkout@v2 - - - name: Set Node.js version - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node }} - - - name: Set up Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - - - name: Disable gem docs - run: 'echo "gem: --no-document" > ~/.gemrc' - - - name: Set up Ruby cache - uses: actions/cache@v1 - with: - path: vendor/bundle - key: ${{ runner.os }}-ruby-v${{ matrix.ruby }}-${{ hashFiles('Gemfile') }}-${{ hashFiles('Gemfile.lock') }} - restore-keys: | - ${{ runner.os }}-ruby-v${{ matrix.ruby }}-${{ hashFiles('Gemfile') }}-${{ hashFiles('Gemfile.lock') }} - ${{ runner.os }}-ruby-v${{ matrix.ruby }}- - - - 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') }} - restore-keys: | - ${{ runner.OS }}-node-v${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }} - ${{ runner.OS }}-node-v${{ matrix.node }}- - - - name: Set up Bundler - run: gem install bundler -v "~> 1.17" - - - run: ruby --version - - run: gem --version - - run: bundle --version - - run: java -version - - - name: Install npm dependencies - run: npm ci - - - name: Install bundler dependencies - run: bundle install --deployment --jobs=4 --retry=3 --clean - - - name: Run tests - run: npm test - - - name: Run bundlewatch - run: npm run bundlewatch - if: matrix.node == 10 - env: - BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}" - CI_BRANCH_BASE: v4-dev - - - 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 - uses: coverallsapp/github-action@master - if: matrix.node == 10 - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" - path-to-lcov: "./js/coverage/lcov.info" -- cgit v1.2.3