Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…ial-design

# Conflicts:
#	rollup.config.js
  • Loading branch information
Vitali Korezki committed Jan 20, 2020
2 parents 67e34c0 + 5718a25 commit 5057312
Show file tree
Hide file tree
Showing 12 changed files with 1,156 additions and 1,243 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1 align=center>Material Design for Bootstrap</h1>

Material Design for Bootstrap is the best way to use [Material Design guidelines by Google](http://www.google.com/design/spec/material-design/introduction.html)
Material Design for Bootstrap is the best way to use [Material Design guidelines by Google](https://material.io/design/introduction/)
in your Bootstrap 4 based application.
Since this is a fully customizable version of Bootstrap, just include Material Design for Bootstrap CSS instead of Bootstrap CSS, and include the JavaScript at
the end of your document (just before the `</body>` tag), and everything will be converted to Material Design.
Expand All @@ -23,7 +23,7 @@ time, please consider becoming a contributor of this project!
If you are interested contact @FezVrasta or just adopt one of our [issues](https://github.com/FezVrasta/bootstrap-material-design/issues).

If you like this project you may support it by [donating](https://www.paypal.me/fezvrasta), starring this repository or reporting issues.
All issues filed should be reduced to a [CodePen](http://codepen.io/rosskevin/pen/eJMMVB) test case where possible.
All issues filed should be reduced to a [CodePen](https://codepen.io/rosskevin/pen/eJMMVB) test case where possible.


## Contributing
Expand All @@ -39,13 +39,13 @@ Please read through our [contributing guidelines](CONTRIBUTING.md). Included are

Moreover, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://codeguide.co/), maintained by [Mark Otto](https://github.com/mdo), one of Bootstrap's founders.

Editor preferences are available in the [editor config](https://github.com/FezVrasta/bootstrap-material-design/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
Editor preferences are available in the [editor config](https://github.com/FezVrasta/bootstrap-material-design/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <https://editorconfig.org>.


## Versioning

For transparency into our release cycle and in striving to maintain backward compatibility, this project is maintained under
[the Semantic Versioning guidelines](http://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible.
[the Semantic Versioning guidelines](https://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible.

See [the Releases section of our GitHub project](https://github.com/fezvrasta/bootstrap-material-design/releases) for changelogs
of each release version.
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ blog: https://blog.getbootstrap.com
expo: https://expo.getbootstrap.com
mkp: https://www.creative-tim.com/product/material-kit-pro?affiliate_id=87385
mdp: https://www.creative-tim.com/product/material-dashboard-pro?affiliate_id=87385
mdbootstrap: https://mdbootstrap.com/material-design-for-bootstrap/?utm_ref_id=26974
mdbootstrap: https://mdbootstrap.com/products/?utm_ref_id=26974

cdn:
# See https://www.srihash.org for info on how to generate the hashes
Expand Down
2 changes: 1 addition & 1 deletion _includes/ads.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=fezvrastagithubiobootstrapmateri" id="_carbonads_js"></script>
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?serve=CKYI553N&placement=fezvrastagithubio" id="_carbonads_js"></script>
6 changes: 3 additions & 3 deletions _includes/docs-navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
<a class="nav-link {% if page.title == "Examples" %}active{% endif %}" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a>
</li>
<li class="nav-item partner creativetim">
<a class="nav-link" href="{{ site.mdp }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Material Dashboard Pro');" target="_blank" rel="noopener">Material Dashboard</a>
<a class="nav-link" href="{{ site.mdp }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Material Dashboard Pro');" target="_blank" rel="sponsored">Material Dashboard</a>
</li>
<li class="nav-item partner creativetim">
<a class="nav-link" href="{{ site.mkp }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Material Kit Pro');" target="_blank" rel="noopener">Material Kit</a>
<a class="nav-link" href="{{ site.mkp }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Material Kit Pro');" target="_blank" rel="sponsored">Material Kit</a>
</li>
<li class="nav-item partner mdbootstrap">
<a class="nav-link" href="{{ site.mdbootstrap }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Material Design for Boostrap PRO');"
target="_blank" rel="noopener">Material Design for Bootstrap PRO</a>
target="_blank" rel="sponsored">Material Design for Bootstrap PRO</a>
</li>
</ul>
</div>
Expand Down
10 changes: 5 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,21 @@ <h3 class="partner mdbootstrap">Material Design for Bootstrap PRO</h3>
<p class="partner mdbootstrap">
2000+ material UI elements, 600+ material icons, 74 CSS animations, SASS files, templates, premium tutorials and many more
</p>
<a class="partner mdbootstrap" href="{{ site.mdbootstrap }}" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Image - mdbootstrap');">
<a class="partner mdbootstrap" href="{{ site.mdbootstrap }}" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Image - mdbootstrap');" rel="sponsored">
<img class="img-fluid mt-3 mx-auto" src="{{ site.baseurl }}/assets/img/mdbootstrap-alt.jpg" alt="Bootstrap Themes" width="1024" height="388">
</a>
<br /><br />
<a href="{{ site.mdbootstrap }}" class="btn btn-outline-primary partner mdbootstrap" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Button - mdbootstrap');">Get Material Design for Bootstrap PRO</a>
<a href="{{ site.mdbootstrap }}" class="btn btn-outline-primary partner mdbootstrap" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Button - mdbootstrap');" rel="sponsored">Get Material Design for Bootstrap PRO</a>

<h3 class="partner creativetim">Official Pro Kits</h3>
<p class="partner creativetim">
Take Material Design for Bootstrap 4 to the next level with official Material Kit Pro and Material Dashboard Pro.
</p>
<a class="partner creativetim" href="{{ site.mkp }}" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Image - creativetim');">
<a class="partner creativetim" href="{{ site.mkp }}" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Image - creativetim');" rel="sponsored">
<img class="img-fluid mt-3 mx-auto" src="{{ site.baseurl }}/assets/img/mk-pro-banner.jpg" alt="Bootstrap Themes" width="1024" height="388">
</a>
<br /><br />
<a href="{{ site.mkp }}" class="btn btn-outline-primary partner creativetim" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Button MKP - creativetim');">Material Kit Pro</a>
<a href="{{ site.mdp }}" class="btn btn-outline-primary partner creativetim" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Button MDP - creativetim');">Material Dashboard Pro</a>
<a href="{{ site.mkp }}" class="btn btn-outline-primary partner creativetim" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Button MKP - creativetim');" rel="sponsored">Material Kit Pro</a>
<a href="{{ site.mdp }}" class="btn btn-outline-primary partner creativetim" onclick="ga('send', 'event', 'Homepage', 'Partner', 'Hero Button MDP - creativetim');" rel="sponsored">Material Dashboard Pro</a>
</div>
</div>
31 changes: 28 additions & 3 deletions js/autofill.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const Autofill = ($ => {
const DATA_KEY = `bmd.${NAME}`;
const JQUERY_NAME = `bmd${NAME.charAt(0).toUpperCase() + NAME.slice(1)}`;
const JQUERY_NO_CONFLICT = $.fn[JQUERY_NAME];
const LAST_VALUE_DATA_KEY = "bmd.last_value";

const Default = {};

Expand Down Expand Up @@ -45,9 +46,21 @@ const Autofill = ($ => {
setInterval(() => {
$("input[type!=checkbox]").each((index, element) => {
let $element = $(element);
if ($element.val() && $element.val() !== $element.attr("value")) {

let previousValue = $element.data(LAST_VALUE_DATA_KEY);
if (previousValue === undefined) {
previousValue = $element.attr("value");
}
if (previousValue === undefined) {
previousValue = "";
}

let currentValue = $element.val();
if (currentValue !== previousValue) {
$element.trigger("change");
}

$element.data(LAST_VALUE_DATA_KEY, currentValue);
});
}, 100);
}
Expand All @@ -61,13 +74,25 @@ const Autofill = ($ => {
let $inputs = $(event.currentTarget)
.closest("form")
.find("input")
.not("[type=file]");
.not("[type=file], [type=date]");
focused = setInterval(() => {
$inputs.each((index, element) => {
let $element = $(element);
if ($element.val() !== $element.attr("value")) {

let previousValue = $element.data(LAST_VALUE_DATA_KEY);
if (previousValue === undefined) {
previousValue = $element.attr("value");
}
if (previousValue === undefined) {
previousValue = "";
}

let currentValue = $element.val();
if (currentValue !== previousValue) {
$element.trigger("change");
}

$element.data(LAST_VALUE_DATA_KEY, currentValue);
});
}, 100);
})
Expand Down
3 changes: 3 additions & 0 deletions js/drawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ const Drawer = ($ => {
return;
}


$(".bmd-layout-drawer").hide();
this.$element.show();
this.$toggles.attr("aria-expanded", true);
this.$element.attr("aria-expanded", true);
this.$element.attr("aria-hidden", false);
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bootstrap-material-design",
"description": "Material Design for Bootstrap 4",
"version": "4.1.1",
"version": "4.1.2",
"keywords": [
"material",
"design",
Expand Down Expand Up @@ -45,24 +45,24 @@
},
"license": "MIT",
"devDependencies": {
"@babel/core": "^7.0.0-beta.38",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.38",
"@babel/preset-env": "^7.0.0-beta.38",
"babel-core": "^6.25.0",
"babel-minify": "^0.2.0",
"@babel/core": "^7.4.4",
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
"@babel/preset-env": "^7.4.4",
"babel-core": "^6.26.3",
"babel-minify": "^0.5.0",
"babel-plugin-module-resolver": "3",
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
"bootstrap": "^4.0.0",
"bootstrap": "^4.3.1",
"cssnano-cli": "^1.0.5",
"jquery": ">=3.0.0",
"node-sass": "^4.5.3",
"node-sass-tilde-importer": "^1.0.0",
"popper.js": "^1.11.0",
"prettier": "^1.5.3",
"rollup": "^0.50.0",
"rollup-plugin-babel": "^4.0.0-beta.0",
"rollup-plugin-commonjs": "^8.2.6",
"rollup-plugin-node-resolve": "^3.0.2"
"jquery": ">=3.4.0",
"node-sass": "^4.12.0",
"node-sass-tilde-importer": "^1.0.2",
"popper.js": "^1.15.0",
"prettier": "^1.17.0",
"rollup": "^1.11.2",
"rollup-plugin-babel": "^4.3.2",
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-node-resolve": "^4.2.3"
},
"files": [
"dist",
Expand Down
11 changes: 6 additions & 5 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ const babelOptions = JSON.parse(fs.readFileSync('./.babelrc'));
export default {
output: {
format: 'umd',
},
globals: {
jquery: 'jQuery',
'popper.js': 'Popper',
globals: {
jquery: 'jQuery',
'popper.js': 'Popper',
},
},
external: ['jquery', 'popper.js'],
plugins: [
babel(Object.assign(babelOptions, {
exclude: 'node_modules/**', // only transpile our source code
externalHelpersWhitelist: [
// Include only required helpers
'defineProperties',
Expand All @@ -27,7 +28,7 @@ export default {
],
}) ),
resolve({
module: true,
mainFields: ['module', 'main'], // Default: ['module', 'main']
}),
cjs({
include: ['node_modules/bootstrap/**', 'node_modules/jquery/**'],
Expand Down
Loading

0 comments on commit 5057312

Please sign in to comment.