From a5ac576063d1b69a028405cb593ea91b1cfb46d6 Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Fri, 31 Oct 2014 10:06:45 +0100 Subject: [PATCH 1/5] added CDN to doc --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 3bfef8ac..fbf6cbf4 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,10 @@ Check out [the demo at this link](http://fezvrasta.github.io/bootstrap-material- BOWER: bower install bootstrap-material-design --save GEMS: gem install bootstrap-material-design +## Use our CDN + +You can find the CDN of this library at [CDNJS.com](https://cdnjs.com/libraries/bootstrap-material-design) + ### LESS & SASS We decided to merge the SASS fork in to the main repository instead of having two seperate ones, [#40](https://github.com/FezVrasta/bootstrap-material-design/issues/40). The default grunt From 113fb0b8c146f309b2f26d8e31d540c3f21d299a Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Fri, 31 Oct 2014 14:37:38 +0100 Subject: [PATCH 2/5] added JSDelivr CDN --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fbf6cbf4..76023445 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Check out [the demo at this link](http://fezvrasta.github.io/bootstrap-material- ## Use our CDN -You can find the CDN of this library at [CDNJS.com](https://cdnjs.com/libraries/bootstrap-material-design) +You can find the CDN of this library at [CDNJS.com](https://cdnjs.com/libraries/bootstrap-material-design) and at [JSDelivr.com](http://www.jsdelivr.com/#!bootstrap.material-design) ### LESS & SASS From 661f20fd7ffcb4fa717eac0e466413f8c6462757 Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Mon, 3 Nov 2014 09:02:56 +0100 Subject: [PATCH 3/5] fixed icons class --- index.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index 3b1bbc03..f42be355 100644 --- a/index.html +++ b/index.html @@ -536,10 +536,10 @@

Variations are available for every icon, included for the original Bootstrap icons.

Example:

- - - - + + + +

@@ -1977,7 +1977,7 @@
-
+

Tile with an icon

Donec id elit non mi porta gravida at eget metus.

@@ -1988,7 +1988,7 @@
-
+

Tile with an icon

Maecenas sed diam eget risus varius blandit.

@@ -1999,7 +1999,7 @@
-
+

Tile with an icon

Maecenas sed diam eget risus varius blandit.

From c75a47d95fd0cb8cac8657732b169602bfa325a3 Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Tue, 4 Nov 2014 10:51:29 +0100 Subject: [PATCH 4/5] more specific selector to avoid problems --- scripts/material.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/material.js b/scripts/material.js index 6cb3804b..e51dd9bb 100644 --- a/scripts/material.js +++ b/scripts/material.js @@ -71,7 +71,7 @@ }); $(document) - .on("change", ".checkbox input", function() { $(this).blur(); }) + .on("change", ".checkbox input[type=checkbox]", function() { $(this).blur(); }) .on("keydown paste", ".form-control", function(e) { if(_isChar(e)) { $(this).removeClass("empty"); From 86d6ff2bda29b54cf4b9d1508e90811f2d68b36d Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Thu, 6 Nov 2014 16:13:13 +0100 Subject: [PATCH 5/5] update --- LICENSE.md | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index f89a5c91..fc2a38a2 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -13,14 +13,9 @@ You can edit and/or redistribute this software only providing a copy of this license with it. You cannot sell this software, any change to the software must be -published under the same license of the original software, in case you -don't want to publish your changes you can use a different license. -It will be valid only if your changes are not published but -keep private for personal projects or closed-source projects, in case -you want to publish your changes you must switch again to the original -license provided with the software. +published under the same license of the original software. -This software can be sold if used inside a software which uses it as +This software may be sold if used inside a software which uses it as dependency, in any case, this license must be included in the software. @@ -29,8 +24,4 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -This license could be edited in any moment without alert. - -Here are listed the authorized individuals and companies and the specific of their licenses: - -- **A*Star Education Ltd**: unlimited usage for websites and webapplications of the company. +This license could be edited in any moment without alert. \ No newline at end of file