Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • B bootstrap
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 263
    • Issues 263
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 114
    • Merge requests 114
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Bootstrap
  • bootstrap
  • Merge requests
  • !30985

V4 dev backports and updates

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged XhmikosR requested to merge v4-dev-xmr into v4-dev 5 years ago
  • Overview 2
  • Commits 14
  • Pipelines 0
  • Changes 56

I could use some help updating @rollup/plugin-node-resolve, not a blocker but we should do it eventually (same on master).

Preview: https://deploy-preview-30985--twbs-bootstrap.netlify.app/

Before merging:

  • Adapt v4-dev branch protection rules
Compare
  • v4-dev (base)

and
  • latest version
    3e366859
    14 commits, 2 years ago

56 files
+ 931
- 763

    Preferences

    File browser
    Compare changes
.gi‎thub‎
ISSUE_T‎EMPLATE‎
bug‎.md‎ +0 -11
bug_re‎port.md‎ +8 -5
featu‎re.md‎ +0 -9
feature_r‎equest.md‎ +4 -1
work‎flows‎
browsers‎tack.yml‎ +40 -0
bundlew‎atch.yml‎ +39 -0
css‎.yml‎ +33 -0
dart-s‎ass.yml‎ +24 -0
docs‎.yml‎ +65 -0
js.‎yml‎ +48 -0
lint‎.yml‎ +33 -0
CONTRIB‎UTING.md‎ +8 -8
bu‎ild‎
bann‎er.js‎ +1 -1
build-pl‎ugins.js‎ +1 -1
change-v‎ersion.js‎ +1 -1
generat‎e-sri.js‎ +1 -1
vnu-j‎ar.js‎ +1 -1
zip-exa‎mples.js‎ +1 -1
j‎s‎
s‎rc‎
to‎ols‎
saniti‎zer.js‎ +1 -1
aler‎t.js‎ +1 -1
butt‎on.js‎ +1 -1
carou‎sel.js‎ +1 -1
colla‎pse.js‎ +1 -1
dropd‎own.js‎ +1 -1
inde‎x.js‎ +1 -1
moda‎l.js‎ +1 -1
popov‎er.js‎ +1 -1
scroll‎spy.js‎ +1 -1
tab‎.js‎ +1 -1
toas‎t.js‎ +1 -1
toolt‎ip.js‎ +1 -1
uti‎l.js‎ +1 -1
te‎sts‎
un‎it‎
tab‎.js‎ +5 -5
READ‎ME.md‎ +1 -1
index‎.html‎ +1 -1
sc‎ss‎
mix‎ins‎
_grid‎.scss‎ +1 -0
_moda‎l.scss‎ +0 -1
_nav‎.scss‎ +2 -0
_variab‎les.scss‎ +5 -12
bootstrap‎-grid.scss‎ +1 -1
bootstrap-‎reboot.scss‎ +1 -1
bootstr‎ap.scss‎ +1 -1
si‎te‎
_d‎ata‎
core-t‎eam.yml‎ +3 -0
_inc‎ludes‎
foote‎r.html‎ +1 -1
docs‎/4.5‎
asset‎s/scss‎
_variab‎les.scss‎ +0 -2
compo‎nents‎
navb‎ar.md‎ +4 -4
nav‎s.md‎ +16 -16
con‎tent‎
rebo‎ot.md‎ +1 -1
examples/flo‎ating-labels‎
floating-‎labels.css‎ +28 -8
util‎ities‎
displ‎ay.md‎ +1 -1
.bundlewatch‎.config.json‎ +1 -1
.gitatt‎ributes‎ +2 -12
Gemfil‎e.lock‎ +4 -4
READ‎ME.md‎ +20 -20
package-‎lock.json‎ +498 -604
packag‎e.json‎ +12 -12
.github/ISSUE_TEMPLATE/bug.md deleted 100644 → 0
+ 0
- 11
  • View file @ 4f44a2af

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/)
.github/ISSUE_TEMPLATE/bug_report.md
+ 8
- 5
  • View file @ 3e366859

  • Edit in single-file editor

  • Open in Web IDE

---
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/)
.github/ISSUE_TEMPLATE/feature.md deleted 100644 → 0
+ 0
- 9
  • View file @ 4f44a2af

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
.github/ISSUE_TEMPLATE/feature_request.md
+ 4
- 1
  • View file @ 3e366859

  • Edit in single-file editor

  • Open in Web IDE


---
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:
.github/workflows/browserstack.yml 0 → 100644
+ 40
- 0
  • View file @ 3e366859

  • Edit in single-file editor

  • Open in Web IDE

name: BrowserStack
on: [push]
env:
CI: true
NODE: 12.x
jobs:
browserstack:
runs-on: ubuntu-latest
if: github.repository == 'twbs/bootstrap'
steps:
- name: Clone repository
uses: actions/checkout@v2
- name: Set Node.js version
uses: actions/setup-node@v1
with:
node-version: "${{ env.NODE }}"
- name: Set up npm cache
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
${{ runner.OS }}-node-v${{ env.NODE }}-
- name: Install npm dependencies
run: npm ci
- name: Run dist
run: npm run dist
- name: Run BrowserStack tests
run: npm run js-test-cloud
env:
BROWSER_STACK_ACCESS_KEY: "${{ secrets.BROWSER_STACK_ACCESS_KEY }}"
BROWSER_STACK_USERNAME: "${{ secrets.BROWSER_STACK_USERNAME }}"
.github/workflows/bundlewatch.yml 0 → 100644
+ 39
- 0
  • View file @ 3e366859

  • Edit in single-file editor

  • Open in Web IDE

name: Bundlewatch
on: [push, pull_request]
env:
CI: true
NODE: 12.x
jobs:
bundlewatch:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v2
- name: Set Node.js version
uses: actions/setup-node@v1
with:
node-version: "${{ env.NODE }}"
- name: Set up npm cache
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
${{ runner.OS }}-node-v${{ env.NODE }}-
- name: Install npm dependencies
run: npm ci
- name: Run dist
run: npm run dist
- name: Run bundlewatch
run: npm run bundlewatch
env:
BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"
CI_BRANCH_BASE: v4-dev
.github/workflows/css.yml 0 → 100644
+ 33
- 0
  • View file @ 3e366859

  • Edit in single-file editor

  • Open in Web IDE

name: CSS
on: [push, pull_request]
env:
CI: true
NODE: 12.x
jobs:
css:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v2
- name: Set Node.js version
uses: actions/setup-node@v1
with:
node-version: "${{ env.NODE }}"
- name: Set up npm cache
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
${{ runner.OS }}-node-v${{ env.NODE }}-
- name: Install npm dependencies
run: npm ci
- name: Build CSS
run: npm run css
.github/workflows/dart-sass.yml 0 → 100644
+ 24
- 0
  • View file @ 3e366859

  • Edit in single-file editor

  • Open in Web IDE

name: CSS (Dart Sass)
on: [push, pull_request]
env:
CI: true
NODE: 12.x
jobs:
css:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v2
- name: Set Node.js version
uses: actions/setup-node@v1
with:
node-version: "${{ env.NODE }}"
- name: Build CSS with Dart Sass
run: |
npx --package sass@latest sass --version
npx --package sass@latest sass --style expanded --source-map --embed-sources --no-error-css scss/:dist-sass/css/
ls -Al dist-sass/css
.github/workflows/test.yml → .github/workflows/docs.yml
+ 65
- 0
  • View file @ 3e366859

  • Edit in single-file editor

  • Open in Web IDE


name: Tests
name: Docs
on: [push, pull_request]
env:
CI: true
NODE: 12.x
RUBY: 2.6.x
jobs:
run:
name: Node ${{ matrix.node }}
docs:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
node: [10, 12]
ruby: [2.6.x]
steps:
- name: Clone repository
uses: actions/checkout@v2
@@ -21,12 +16,12 @@ jobs:
- name: Set Node.js version
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}
node-version: "${{ env.NODE }}"
- name: Set up Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
ruby-version: ${{ env.RUBY }}
- name: Disable gem docs
run: 'echo "gem: --no-document" > ~/.gemrc'
@@ -35,19 +30,19 @@ jobs:
uses: actions/cache@v2
with:
path: vendor/bundle
key: ${{ runner.os }}-ruby-v${{ matrix.ruby }}-${{ hashFiles('Gemfile') }}-${{ hashFiles('Gemfile.lock') }}
key: ${{ runner.os }}-ruby-v${{ env.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 }}-
${{ runner.os }}-ruby-v${{ env.RUBY }}-${{ hashFiles('Gemfile') }}-${{ hashFiles('Gemfile.lock') }}
${{ runner.os }}-ruby-v${{ env.RUBY }}-
- name: Set up npm cache
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-v${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
key: ${{ runner.os }}-node-v${{ env.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 }}-
${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
${{ runner.OS }}-node-v${{ env.NODE }}-
- name: Set up Bundler
run: gem install bundler -v "~> 1.17"
@@ -63,26 +58,8 @@ jobs:
- 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: Copy CSS and JS
run: npm run css-copy && npm run js-copy
- 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"
- name: Test docs
run: npm run docs
.github/workflows/js.yml 0 → 100644
+ 48
- 0
  • View file @ 3e366859

  • Edit in single-file editor

  • Open in Web IDE

name: JS 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]
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 npm cache
uses: actions/cache@v2
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: Install npm dependencies
run: npm ci
- name: Run dist
run: npm run js
- name: Run JS tests
run: npm run js-test
- name: Run Coveralls
uses: coverallsapp/github-action@master
if: matrix.node == 12
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
path-to-lcov: "./js/coverage/lcov.info"
.github/workflows/lint.yml 0 → 100644
+ 33
- 0
  • View file @ 3e366859

  • Edit in single-file editor

  • Open in Web IDE

name: Lint
on: [push, pull_request]
env:
CI: true
NODE: 12.x
jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v2
- name: Set Node.js version
uses: actions/setup-node@v1
with:
node-version: "${{ env.NODE }}"
- name: Set up npm cache
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
${{ runner.OS }}-node-v${{ env.NODE }}-
- name: Install npm dependencies
run: npm ci
- name: Lint
run: npm run lint
.github/CONTRIBUTING.md
+ 8
- 8
  • View file @ 3e366859

  • Edit in single-file editor

  • Open in Web IDE


@@ -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
0 Assignees
None
Assign to
Reviewer
Mark Otto's avatar
Mark Otto
Request review from
Labels
1
v4
1
v4
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
4
4 participants
Mark Otto
Administrator
XhmikosR
Ghost User
Reference: twbs/bootstrap!30985
Source branch: v4-dev-xmr

Menu

Explore Projects Groups Snippets