From cf24690e81e9f3f98738491517e149a66ca0f3c5 Mon Sep 17 00:00:00 2001 From: Chase Tran Date: Thu, 7 May 2020 18:00:09 +0000 Subject: [PATCH 1/4] attempt to fix location of image files --- assets/scss/material-kit/variables/_carousel.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/scss/material-kit/variables/_carousel.scss b/assets/scss/material-kit/variables/_carousel.scss index 5ab1b5f1..a920ab9b 100644 --- a/assets/scss/material-kit/variables/_carousel.scss +++ b/assets/scss/material-kit/variables/_carousel.scss @@ -1,10 +1,10 @@ .carousel{ &.carousel-full-navigation{ .left{ - cursor: url("../../img/arrow-left.png"), url("../../img/arrow-left.cur"), default !important; + cursor: url("../../../img/arrow-left.png"), url("../../../img/arrow-left.cur"), default !important; } .right{ - cursor: url("../../img/arrow-right.png"), url("../../img/arrow-right.cur"), default !important; + cursor: url("../../../img/arrow-right.png"), url("../../../img/arrow-right.cur"), default !important; } } } From 7feab7d5e4d71edb50623928d522c8a01101983f Mon Sep 17 00:00:00 2001 From: Chase Tran Date: Thu, 7 May 2020 19:32:41 +0000 Subject: [PATCH 2/4] change package.json before npm publish --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f2509eaf..62aa3f16 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,11 @@ { - "name": "material-kit", + "name": "@chase439/material-kit", "version": "2.0.7", "description": "Material Kit, a Google Material Desgin. Coded by Creative Tim", "main": "index.html", "directories": { - "example": "root" + "doc": "docs", + "example": "examples" }, "scripts": { "open-app": "gulp open-app", From 10dd799ab9f310081a6dd0c70f03536ef9804332 Mon Sep 17 00:00:00 2001 From: Chase Tran Date: Sun, 4 Oct 2020 06:20:35 +0000 Subject: [PATCH 3/4] update github url for this npm scope --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 62aa3f16..08efd958 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/creativetimofficial/material-kit.git" + "url": "git+ssh://git@github.com/chase439/material-kit.git" }, "keywords": [ "material kit", From b03f06b55009f10631f27c848a0a8024edf6fb01 Mon Sep 17 00:00:00 2001 From: Chase Date: Mon, 19 Oct 2020 12:11:31 -0400 Subject: [PATCH 4/4] Update _functions.scss https://github.com/twbs/bootstrap/pull/26689/files --- assets/scss/material-kit/bootstrap/scss/_functions.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scss/material-kit/bootstrap/scss/_functions.scss b/assets/scss/material-kit/bootstrap/scss/_functions.scss index 1266d34b..eebae45d 100644 --- a/assets/scss/material-kit/bootstrap/scss/_functions.scss +++ b/assets/scss/material-kit/bootstrap/scss/_functions.scss @@ -8,7 +8,7 @@ $prev-key: null; $prev-num: null; @each $key, $num in $map { - @if $prev-num == null { + @if $prev-num == null or unit($num) == "%" { // Do nothing } @else if not comparable($prev-num, $num) { @warn "Potentially invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} whose unit makes it incomparable to #{$prev-num}, the value of the previous key '#{$prev-key}' !";