Skip to content

Commit

Permalink
Merge bootstrap 4.1.3 into Boosted see Bootstrap release note : https…
Browse files Browse the repository at this point in the history
  • Loading branch information
Lausselloic committed Jul 25, 2018
1 parent 3c3871d commit d631113
Show file tree
Hide file tree
Showing 87 changed files with 478 additions and 371 deletions.
3 changes: 1 addition & 2 deletions .babelrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ module.exports = {
]
],
plugins: [
process.env.PLUGINS && 'transform-es2015-modules-strip',
'@babel/proposal-object-rest-spread'
].filter(Boolean),
],
env: {
test: {
plugins: [ 'istanbul' ]
Expand Down
13 changes: 13 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# https://github.com/browserslist/browserslist#readme

>= 1%
last 1 major version
not dead
Chrome >= 45
Firefox >= 38
Edge >= 12
Explorer >= 10
iOS >= 9
Safari >= 9
Android >= 4.4
Opera >= 30
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Bug report
about: Tell us about a bug you may have identified in Bootstrap.

---

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/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/)
15 changes: 15 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
name: Feature request
about: Suggest an idea for a new feature in Bootstrap.

---

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/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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@

Several quick start options are available:

- [Download the latest release.](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/archive/v4.1.2.zip)
- [Download the latest release.](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/archive/v4.1.3.zip)
- Clone the repo: `git clone https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap.git`
- Install with [npm](https://www.npmjs.com): `npm install boosted`
- Install with [yarn](https://github.com/yarnpkg/yarn): `yarn add boosted@4.1.2`
- Install with [Composer](https://getcomposer.org): `composer require orange-opensource/orange-boosted-bootstrap:4.1.2`
- Install with [yarn](https://github.com/yarnpkg/yarn): `yarn add boosted@4.1.3`
- Install with [Composer](https://getcomposer.org): `composer require orange-opensource/orange-boosted-bootstrap:4.1.3`
- Install with [NuGet](https://www.nuget.org/): CSS: `Install-Package boosted` Sass: `Install-Package boosted.sass`.

Read the [Getting started page](http://boosted.orange.com/docs/4.1/getting-started/introduction/) for information on the framework contents, templates and examples, and more.

## Status

[![Build Status](https://img.shields.io/travis/Orange-OpenSource/Orange-Boosted-Bootstrap.svg)](https://travis-ci.org/Orange-OpenSource/Orange-Boosted-Bootstrap)
[![Build Status](https://img.shields.io/travis/Orange-OpenSource/Orange-Boosted-Bootstrap/v4.1.1.svg)](https://travis-ci.org/Orange-OpenSource/Orange-Boosted-Bootstrap)
[![npm version](https://img.shields.io/npm/v/boosted.svg)](https://www.npmjs.com/package/boosted)

[![Packagist Prerelease](https://img.shields.io/packagist/v/orange-opensource/orange-boosted-bootstrap.svg)](https://packagist.org/packages/orange-opensource/orange-boosted-bootstrap)
Expand Down
16 changes: 8 additions & 8 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ social_image_path: /docs/4.1/assets/brand/bootstrap-social.png
social_logo_path: /docs/4.1/assets/brand/bootstrap-social-logo.png

# Custom variables
current_version: 4.1.2
current_ruby_version: 4.1.2
current_version: 4.1.3
current_ruby_version: 4.1.3
docs_version: 4.1
repo: "https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap"
slack: "https://bootstrap-slack.herokuapp.com"
Expand All @@ -106,15 +106,15 @@ jobs: "https://jobs.getbootstrap.com"
themes: "https://themes.getbootstrap.com"

download:
source: "https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/archive/v4.1.2.zip"
dist: "https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/releases/download/v4.1.2/boosted-4.1.2-dist.zip"
source: "https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/archive/v4.1.3.zip"
dist: "https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/releases/download/v4.1.3/boosted-4.1.3-dist.zip"

cdn:
# See https://www.srihash.org for info on how to generate the hashes
css: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/css/bootstrap.min.css"
css_hash: "sha384-Smlep5jCw/wG7hdkwQ/Z5nLIefveQRIY9nfy6xoR1uRYBtpZgI6339F5dgvm/e9B"
js: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/js/bootstrap.min.js"
js_hash: "sha384-o+RDsa0aLu++PJvFqy8fFScvbHFLtbvScb8AjopnFD+iEQ7wo/CG0xlczd+2O/em"
css: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
css_hash: "sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO"
js: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"
js_hash: "sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
jquery: "https://code.jquery.com/jquery-3.3.1.slim.min.js"
jquery_hash: "sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"
Expand Down
81 changes: 81 additions & 0 deletions build/build-plugins.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*!
* Script to build our plugins to use them separately.
* Copyright 2018 The Bootstrap Authors
* Copyright 2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

'use strict'

const rollup = require('rollup')
const path = require('path')
const babel = require('rollup-plugin-babel')
const TEST = process.env.NODE_ENV === 'test'

const plugins = [
babel({
exclude: 'node_modules/**', // Only transpile our source code
externalHelpersWhitelist: [ // Include only required helpers
'defineProperties',
'createClass',
'inheritsLoose',
'defineProperty',
'objectSpread'
]
})
]

const format = 'umd'
const rootPath = !TEST ? '../js/dist/' : '../js/coverage/dist/'
const bsPlugins = {
Alert: path.resolve(__dirname, '../js/src/alert.js'),
Button: path.resolve(__dirname, '../js/src/button.js'),
Carousel: path.resolve(__dirname, '../js/src/carousel.js'),
Collapse: path.resolve(__dirname, '../js/src/collapse.js'),
Dropdown: path.resolve(__dirname, '../js/src/dropdown.js'),
Modal: path.resolve(__dirname, '../js/src/modal.js'),
Popover: path.resolve(__dirname, '../js/src/popover.js'),
ScrollSpy: path.resolve(__dirname, '../js/src/scrollspy.js'),
Tab: path.resolve(__dirname, '../js/src/tab.js'),
Tooltip: path.resolve(__dirname, '../js/src/tooltip.js'),
Util: path.resolve(__dirname, '../js/src/util.js')
}

Object.keys(bsPlugins)
.forEach((pluginKey) => {
console.log(`Building ${pluginKey} plugin...`)

const external = ['jquery', 'popper.js']
const globals = {
jquery: 'jQuery', // Ensure we use jQuery which is always available even in noConflict mode
'popper.js': 'Popper'
}

// Do not bundle Util in plugins
if (pluginKey !== 'Util') {
external.push(bsPlugins.Util)
globals[bsPlugins.Util] = 'Util'
}

// Do not bundle Tooltip in Popover
if (pluginKey === 'Popover') {
external.push(bsPlugins.Tooltip)
globals[bsPlugins.Tooltip] = 'Tooltip'
}

rollup.rollup({
input: bsPlugins[pluginKey],
plugins,
external
}).then((bundle) => {
bundle.write({
format,
name: pluginKey,
sourcemap: true,
globals,
file: path.resolve(__dirname, `${rootPath}${pluginKey.toLowerCase()}.js`)
})
.then(() => console.log(`Building ${pluginKey} plugin... Done !`))
.catch((err) => console.error(`${pluginKey}: ${err}`))
})
})
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "orange-opensource/orange-boosted-bootstrap",
"description": "Orange Boosted with Bootstrap is a framework library accessible, ergonomic and Orange branded based on Bootstrap v4.1.2.",
"description": "Orange Boosted with Bootstrap is a framework library accessible, ergonomic and Orange branded based on Bootstrap v4.1.3.",
"keywords": [
"css",
"js",
Expand Down
4 changes: 2 additions & 2 deletions js/src/alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Util from './util'

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): alert.js
* Bootstrap (v4.1.3): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -16,7 +16,7 @@ const Alert = (($) => {
*/

const NAME = 'alert'
const VERSION = '4.1.2'
const VERSION = '4.1.3'
const DATA_KEY = 'bs.alert'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'
Expand Down
4 changes: 2 additions & 2 deletions js/src/button.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import $ from 'jquery'

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): button.js
* Bootstrap (v4.1.3): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -15,7 +15,7 @@ const Button = (($) => {
*/

const NAME = 'button'
const VERSION = '4.1.2'
const VERSION = '4.1.3'
const DATA_KEY = 'bs.button'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'
Expand Down
4 changes: 2 additions & 2 deletions js/src/carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Util from './util'

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): carousel.js
* Bootstrap (v4.1.3): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -16,7 +16,7 @@ const Carousel = (($) => {
*/

const NAME = 'carousel'
const VERSION = '4.1.2'
const VERSION = '4.1.3'
const DATA_KEY = 'bs.carousel'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'
Expand Down
4 changes: 2 additions & 2 deletions js/src/collapse.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Util from './util'

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): collapse.js
* Bootstrap (v4.1.3): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -16,7 +16,7 @@ const Collapse = (($) => {
*/

const NAME = 'collapse'
const VERSION = '4.1.2'
const VERSION = '4.1.3'
const DATA_KEY = 'bs.collapse'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'
Expand Down
4 changes: 2 additions & 2 deletions js/src/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Util from './util'

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): dropdown.js
* Bootstrap (v4.1.3): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -17,7 +17,7 @@ const Dropdown = (($) => {
*/

const NAME = 'dropdown'
const VERSION = '4.1.2'
const VERSION = '4.1.3'
const DATA_KEY = 'bs.dropdown'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'
Expand Down
2 changes: 1 addition & 1 deletion js/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Util from './util'

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): index.js
* Bootstrap (v4.1.3): index.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
4 changes: 2 additions & 2 deletions js/src/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Util from './util'

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): modal.js
* Bootstrap (v4.1.3): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -16,7 +16,7 @@ const Modal = (($) => {
*/

const NAME = 'modal'
const VERSION = '4.1.2'
const VERSION = '4.1.3'
const DATA_KEY = 'bs.modal'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'
Expand Down
4 changes: 2 additions & 2 deletions js/src/o-megamenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Util from './util'

/**
* --------------------------------------------------------------------------
* Boosted (v4.1.2): o-megamenu.js
* Boosted (v4.1.3): o-megamenu.js
* Licensed under MIT (https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -18,7 +18,7 @@ const MegaMenu = (($) => {
*/

const NAME = 'megamenu'
const VERSION = '4.1.2'
const VERSION = '4.1.3'
const DATA_KEY = 'bs.megamenu'
const JQUERY_NO_CONFLICT = $.fn[NAME]
const ARROW_LEFT_KEYCODE = 37 // KeyboardEvent.which value for left arrow key
Expand Down
4 changes: 2 additions & 2 deletions js/src/o-navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Util from './util'

/**
* --------------------------------------------------------------------------
* Boosted (v4.1.2): o-navbar.js
* Boosted (v4.1.3): o-navbar.js
* Licensed under MIT (https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -17,7 +17,7 @@ const Navbar = (($) => {
*/

const NAME = 'navbar'
const VERSION = '4.1.2'
const VERSION = '4.1.3'
const DATA_KEY = 'bs.navbar'
const JQUERY_NO_CONFLICT = $.fn[NAME]
const BREAKPOINT = 768
Expand Down
4 changes: 2 additions & 2 deletions js/src/o-priority-nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import $ from 'jquery'

/**
* --------------------------------------------------------------------------
* Boosted (v4.1.2): o-priority-nav.js
* Boosted (v4.1.3): o-priority-nav.js
* Licensed under MIT (https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -15,7 +15,7 @@ const PriorityNav = (($) => {
*/

const NAME = 'prioritynav'
const VERSION = '4.1.2'
const VERSION = '4.1.3'
const DATA_KEY = 'bs.prioritynav'
const JQUERY_NO_CONFLICT = $.fn[NAME]
const RESIZE_DURATION = 500
Expand Down
4 changes: 2 additions & 2 deletions js/src/o-scroll-up.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import $ from 'jquery'

/**
* --------------------------------------------------------------------------
* Boosted (v4.1.2): o-scroll-up.js
* Boosted (v4.1.3): o-scroll-up.js
* Licensed under MIT (https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand All @@ -15,7 +15,7 @@ const ScrollUp = (($) => {
*/

const NAME = 'scrollup'
const VERSION = '4.1.2'
const VERSION = '4.1.3'
const DATA_KEY = 'bs.scrollup'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'
Expand Down
Loading

0 comments on commit d631113

Please sign in to comment.