Skip to content

Commit

Permalink
Release 4.6.0-rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
djibe committed Feb 8, 2021
1 parent e716a55 commit aed84d2
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 10 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@

## 4.6.0 - RC1

- **New** Upgraded to Bootstrap 4.6.
https://blog.getbootstrap.com/2021/01/19/bootstrap-4.6.0/
- **New** Upgraded to Bootstrap 4.6.
- **Updated** docs for BS 4.6.
- **Updated** JS dependencies from BS 4.6.
- **Fixed** Removed link:hover underline.
Expand Down
24 changes: 17 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ djibe-material/
│ ├── material.css
│ ├── material.css.map
│ ├── material.min.css
│ └── material.min.css.map
│ ├── material.min.css.map
| ├── material-plugins.css
│ ├── material-plugins.css.map
│ ├── material-plugins.min.css
│ └── material-plugins.min.css.map
└── js/
├── material.js
├── material.js.map
Expand All @@ -74,6 +78,8 @@ djibe-material/

We provide compiled CSS and JavaScript (`material.*`), as well as compiled and minified CSS and JavaScript (`material.min.*`). CSS and JavaScript source maps (`material.*.map`) are also available for use with certain browsers' developer tools.

`material-plugins.css` is an addon containing suitable style for the Plugins (see doc's Plugin section).

The Material 2 source code download includes the precompiled CSS and JavaScript, along with documentation and source assets. More specifically, it includes the following and more:

```
Expand All @@ -85,9 +91,13 @@ djibe-material/
│ ├── material.css
│ ├── material.css.map
│ ├── material.min.css
│ └── material.min.css.map
│ ├── material.min.css.
│ ├── material-plugins.css
│ ├── material-plugins.css.map
│ ├── material-plugins.min.css
│ └── material-plugins.min.css.map
├── docs/
│ └── 4.5/
│ └── 4.6/
└── js/
├── material.js
├── material.js.map
Expand All @@ -97,11 +107,11 @@ djibe-material/

## Documentation

Material's 2 documentation that is included in this repo located in the root directory, is built with [Jekyll](https://jekyllrb.com/) and publicly hosted on GitHub Pages at <http://djibe.github.io/material/>. The docs can also be hosted locally.
Material's 2 documentation that is included in this repo located in the root directory, is built with [Jekyll](https://jekyllrb.com/) and publicly hosted on GitHub Pages at <https://djibe.github.io/material/>. The docs can also be hosted locally.

### Running Documentation Locally

1. Run through the [tooling setup](https://djibe.github.io/material/docs/4.5/getting-started/tooling/#getting-started) to install Jekyll and other Ruby dependencies with `bundle install`.
1. Run through the [tooling setup](https://djibe.github.io/material/docs/4.6/getting-started/tooling/#getting-started) to install Jekyll and other Ruby dependencies with `bundle install`.
2. Run `npm install` to install Node.js dependencies.
3. Run `npm run dist` and `npm run docs` to rebuild distributed CSS and JavaScript files, as well as docs assets.
4. If you had end-of-line errors when running the commands indicated in step #3 then, please follow [this step](#end-of-line-fix) before proceeding, or else proceed to step #5.
Expand All @@ -125,11 +135,11 @@ In order to fix this problem, you have to save all modified files that is not ye

#### Command Notes

- At command #1, we have to configure github to stop interpretting our files in the repo to convert the end-of-line to **CRLF**.
- At command #1, we have to configure github to stop interpreting our files in the repo to convert the end-of-line to **CRLF**.
- At command #2, since we configured our github to stop converting those into **CRLF** where it is expected to be **LF**, we have to remove all the cache files and remove them in recursive way in the same path where your command line directory is at. (For instance, your command line target path is this repository.)
- And finally at command #3, we have to reset the state of your saved local repo by issuing `--hard` command. Where, all modified files that is not included in the latest commit of repo will be removed.

Now try issuing commands from the recent steps earlier and *****that should work fine*****.
Now try issuing commands from the recent steps earlier and ***that should work fine***.

## Quick start

Expand Down
2 changes: 1 addition & 1 deletion docs-assets/js/docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
// Docsearch
/* docsearch({
algoliaOptions: {
facetFilters: ['version: 4.5']
facetFilters: ['version: 4.6']
},
apiKey: 'c1af50add5aa791153ec947a3035b0c4',
debug: false,
Expand Down

0 comments on commit aed84d2

Please sign in to comment.