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
  • !30682

V4 dev backports

  • Review changes

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

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

Fixes #30514 (closed)

Compare
  • v4-dev (base)

and
  • latest version
    f75c036a
    9 commits, 2 years ago

11 files
+ 111
- 14

    Preferences

    File browser
    Compare changes
.github/‎workflows‎
codeq‎l.yml‎ +28 -0
bu‎ild‎
zip-exa‎mples.js‎ +55 -0
js/‎src‎
moda‎l.js‎ +5 -2
sc‎ss‎
_reboo‎t.scss‎ +3 -0
si‎te‎
_d‎ata‎
browser-fe‎atures.yml‎ +2 -2
_inc‎ludes‎
socia‎l.html‎ +1 -2
_lay‎outs‎
simpl‎e.html‎ +1 -0
docs‎/4.4‎
assets‎/js/src‎
sear‎ch.js‎ +6 -6
getting‎-started‎
downl‎oad.md‎ +6 -0
_conf‎ig.yml‎ +1 -0
packag‎e.json‎ +3 -2
.github/workflows/codeql.yml 0 → 100644
+ 28
- 0
  • View file @ f75c036a

  • Edit in single-file editor

  • Open in Web IDE

name: "Code Scanning - Action"
on:
push:
pull_request:
schedule:
- cron: "0 0 * * 0"
jobs:
CodeQL-Build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: javascript
- name: Autobuild
uses: github/codeql-action/autobuild@v1
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
build/zip-examples.js 0 → 100644
+ 55
- 0
  • View file @ f75c036a

  • Edit in single-file editor

  • Open in Web IDE

#!/usr/bin/env node
/*!
* Script to create the built examples zip archive;
* requires the `zip` command to be present!
* Copyright 2020 The Bootstrap Authors
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
'use strict'
const path = require('path')
const sh = require('shelljs')
const {
version, version_short: versionShort
} = require('../package.json')
const folderName = `bootstrap-${version}-examples`
sh.config.fatal = true
if (!sh.test('-d', '_gh_pages')) {
throw new Error('The _gh_pages folder does not exist, did you forget building the docs?')
}
// switch to the root dir
sh.cd(path.join(__dirname, '..'))
// remove any previously created folder with the same name
sh.rm('-rf', folderName)
sh.mkdir('-p', folderName)
// copy the examples and dist folders; for the examples we use `*`
// so that its content are copied to the root dist dir
sh.cp('-Rf', [
`_gh_pages/docs/${versionShort}/examples/*`,
`_gh_pages/docs/${versionShort}/dist/`
], folderName)
sh.rm(`${folderName}/index.html`)
// sed-fu
sh.find(`${folderName}/**/*.html`).forEach((file) => {
sh.sed('-i', new RegExp(`"/docs/${versionShort}/`, 'g'), '"../', file)
sh.sed('-i', /(<link href="\.\.\/.*) integrity=".*>/g, '$1>', file)
sh.sed('-i', /(<script src="\.\.\/.*) integrity=".*>/g, '$1></script>', file)
})
// create the zip file
sh.exec(`zip -r9 "${folderName}.zip" "${folderName}"`, {
fatal: true
})
// remove the folder we created
sh.rm('-rf', folderName)
js/src/modal.js
+ 5
- 2
  • View file @ f75c036a

  • Edit in single-file editor

  • Open in Web IDE


@@ -455,8 +455,11 @@ class Modal {
}
_checkScrollbar() {
const rect = document.body.getBoundingClientRect()
this._isBodyOverflowing = rect.left + rect.right < window.innerWidth
const {
left, right
} = document.body.getBoundingClientRect()
this._isBodyOverflowing = Math.floor(left + right) < window.innerWidth
this._scrollbarWidth = this._getScrollbarWidth()
}
scss/_reboot.scss
+ 3
- 0
  • View file @ f75c036a

  • Edit in single-file editor

  • Open in Web IDE


@@ -229,6 +229,9 @@ pre {
margin-bottom: 1rem;
// Don't allow content to break outside
overflow: auto;
// Disable auto-hiding scrollbar in IE & legacy Edge to avoid overlap,
// making it impossible to interact with the content
-ms-overflow-style: scrollbar;
}
site/_data/browser-features.yml
+ 2
- 2
  • View file @ f75c036a

  • Edit in single-file editor

  • Open in Web IDE


@@ -82,7 +82,7 @@
browser: >
Chrome
summary: >
Fire a [`transitioncancel` event](https://developer.mozilla.org/en-US/docs/Web/Events/transitioncancel) when a CSS transition is canceled
Fire a [`transitioncancel` event](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/transitioncancel_event) when a CSS transition is canceled
upstream_bug: >
Chromium#642487
origin: >
@@ -112,7 +112,7 @@
browser: >
Safari
summary: >
Fire a [`transitioncancel` event](https://developer.mozilla.org/en-US/docs/Web/Events/transitioncancel) when a CSS transition is canceled
Fire a [`transitioncancel` event](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/transitioncancel_event) when a CSS transition is canceled
upstream_bug: >
WebKit#161535
origin: >
0 Assignees
None
Assign to
0 Reviewers
None
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
3
3 participants
Administrator
XhmikosR
Ghost User
Reference: twbs/bootstrap!30682
Source branch: v4-dev-xmr

Menu

Explore Projects Groups Snippets