Skip to content

Commit

Permalink
chore(patch): patch from bootstrap 33715a73d2eae3865cb4c1e0a13d1da4b6…
Browse files Browse the repository at this point in the history
…aeb278
  • Loading branch information
Lausselloic committed May 2, 2017
1 parent 4fb25a1 commit fac451c
Show file tree
Hide file tree
Showing 43 changed files with 16,762 additions and 1,617 deletions.
10 changes: 3 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ restrictions:
Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments)
instead. We reserve the right to delete comments which violate this rule.

* Please **do not** open issues or pull requests regarding the code in
[`Normalize`](https://github.com/necolas/normalize.css) (open them in
its repository).

* Please **do not** open issues regarding the official themes offered on <https://themes.getbootstrap.com/>.
Instead, please email any questions or feedback regarding those themes to `themes AT getbootstrap DOT com`.

Expand All @@ -46,7 +42,7 @@ Our bug tracker utilizes several labels to help organize and identify issues. He
- `docs` - Issues for improving or updating our documentation.
- `examples` - Issues involving the example templates included in our docs.
- `feature` - Issues asking for a new feature to be added, or an existing one to be extended or modified. New features require a minor version bump (e.g., `v3.0.0` to `v3.1.0`).
- `grunt` - Issues with our included JavaScript-based Gruntfile, which is used to run all our tests, concatenate and compile source files, and more.
- `grunt` - Issues with our build system, which is used to run all our tests, concatenate and compile source files, and more.
- `help wanted` - Issues we need or would love help from the community to resolve.
- `js` - Issues stemming from our compiled or source JavaScript files.
- `meta` - Issues with the project itself or our GitHub repository.
Expand All @@ -73,7 +69,7 @@ Guidelines for bug reports:

3. **Isolate the problem** &mdash; ideally create a [reduced test
case](https://css-tricks.com/reduced-test-cases/) and a live example.
[This JS Bin](https://jsbin.com/qusafa/edit?html,output) is a helpful template.
[This JS Bin](https://jsbin.com/lolome/edit?html,output) is a helpful template.


A good bug report shouldn't leave others needing to chase you up for more
Expand Down Expand Up @@ -245,7 +241,7 @@ includes code changes) and under the terms of the

### Checking coding style

Run `grunt test` before committing to ensure your changes follow our coding standards.
Run `npm run test` before committing to ensure your changes follow our coding standards.


## License
Expand Down
36 changes: 25 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
# [Boosted](http://boosted.orange.com)
<p align="center">
<a href="http://boosted.orange.com/v4-alpha">
<img src="http://boosted.orange.com/v4-alpha/assets/brand/orange-space-position.png" width=72 height=72>
</a>

![Bower version](https://img.shields.io/bower/v/boosted.svg)
[![npm version](https://img.shields.io/npm/v/boosted.svg)](https://www.npmjs.com/package/boosted)
[![Build Status](https://img.shields.io/travis/Orange-OpenSource/Orange-Boosted-Bootstrap/v4-dev.svg)](https://travis-ci.org/Orange-OpenSource/Orange-Boosted-Bootstrap)
[![Packagist Prerelease](https://img.shields.io/packagist/vpre/orange-opensource/orange-boosted-bootstrap.svg)](https://packagist.org/packages/orange-opensource/orange-boosted-bootstrap)
<h3 align="center">Orange Boosted with Bootstrap</h3>

Boosted is a fork of Bootstrap. Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/orgs/twbs/people) with the massive support and involvement of the community.
<p align="center">
Boosted is a fork of Bootstrap. Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development.
<br>
<a href="http://boosted.orange.com/v4-alpha"><strong>Visit Boosted</strong></a>
</p>
</p>

To get started, check out <http://boosted.orange.com>!
<br>

## Table of contents

- [Quick start](#quick-start)
- [Branch](#branch-usage)
- [Status](#status)
- [What's included](#whats-included)
- [Branch usage] (#branch-usage)
- [Bugs and feature requests](#bugs-and-feature-requests)
- [Documentation](#documentation)
- [Contributing](#contributing)
Expand All @@ -29,12 +36,19 @@ Several quick start options are available:
- Clone the repo: `git clone https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap.git`
- Install with [npm](https://www.npmjs.com): `npm install [email protected]`
- Install with [yarn](https://github.com/yarnpkg/yarn): `yarn add [email protected]`
- Install with [Bower](https://bower.io): `bower install boosted#v4.0.0-alpha.6.1`
- Install with [Composer](https://getcomposer.org): `composer require orange-opensource/orange-boosted-bootstrap:4.0.0-alpha.6.1`
- Install with [Bower](https://bower.io): `bower install boosted#v4.0.0-alpha.6.1`

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

### What's included
## Status

![Bower](https://img.shields.io/bower/v/boosted.svg)
[![npm version](https://img.shields.io/npm/v/boosted.svg)](https://www.npmjs.com/package/boosted)
[![Build Status](https://img.shields.io/travis/Orange-OpenSource/Orange-Boosted-Bootstrap/v4-dev.svg)](https://travis-ci.org/Orange-OpenSource/Orange-Boosted-Bootstrap)
[![Packagist Prerelease](https://img.shields.io/packagist/vpre/orange-opensource/orange-boosted-bootstrap.svg)](https://packagist.org/packages/orange-opensource/orange-boosted-bootstrap)

## What's included

Within the download you'll find the following directories and files, logically grouping common assets and providing both compiled and minified variations. You'll see something like this:

Expand Down Expand Up @@ -92,7 +106,7 @@ Boosted documentation, included in this repo in the root directory, is built wit
### Running documentation locally

1. Run through the [tooling setup](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/v4-dev/docs/getting-started/build-tools.md#tooling-setup) to install Jekyll (the site builder) and other Ruby dependencies with `bundle install`.
2. Run `grunt` (or a specific set of Grunt tasks) to rebuild distributed CSS and JavaScript files, as well as our docs assets.
2. Run `npm run test` (or a specific NPM script) to rebuild distributed CSS and JavaScript files, as well as our docs assets.
3. From the root `/Orange-Boosted-Bootstrap` directory, run `bundle exec jekyll serve` in the command line.
4. Open <http://localhost:9001> in your browser, and voilà.

Expand Down
File renamed without changes.
38 changes: 38 additions & 0 deletions build/docs-rtl.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/usr/bin/env node

'use strict'

/*!
* Script to update version number references in the project.
* Copyright 2017 The Bootstrap Authors
* Copyright 2017 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

/* global Set */

var fs = require('fs')
var path = require('path')
var sh = require('shelljs')
sh.config.fatal = true
var sed = sh.sed

sh.exec("find docs-orange/examples/ -mindepth 1 -maxdepth 1 -type d ! -name 'screenshots' -exec bash -c 'mkdir -p .tmpdocs/examples/rtl-$(basename \"{}\") ; cp -av \"{}\"/* .tmpdocs/examples/rtl-$(basename \"{}\")/' ;", function(code, stdout, stderr) {
console.log('Exit code:', code);
console.log('Program output:', stdout);
console.log('Program stderr:', stderr);
});

sh.exec("find .tmpdocs/examples/rtl-* -type f -name '*.html' -exec sed -i 's/boosted\./boosted\.min\./gi' {} \;", function(code, stdout, stderr) {
console.log('Exit code:', code);
console.log('Program output:', stdout);
console.log('Program stderr:', stderr);
});

sh.exec("find .tmpdocs/examples/rtl-* -type f -name '*.html' -exec sed -i 's/html lang=\"en\">/html lang=\"en\" dir=\"rtl\"/gi' {} \;", function(code, stdout, stderr) {
console.log('Exit code:', code);
console.log('Program output:', stdout);
console.log('Program stderr:', stderr);
});


File renamed without changes.
Loading

0 comments on commit fac451c

Please sign in to comment.