From 4144816f7c8e344793a9fd080019e21f1fbe5c41 Mon Sep 17 00:00:00 2001 From: Nato Boram Date: Tue, 7 Jul 2020 21:11:46 -0400 Subject: [PATCH] Updated `bootstrap` and `ipfs-css` --- CHANGELOG.md | 1 + angular.json | 16 +++------------- package.json | 6 +++--- src/styles.scss | 1 + yarn.lock | 16 ++++++++-------- 5 files changed, 16 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 675b545..62acc5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this - Better screenshot - Upgraded to Angular 10 - Now uses `--chunker=buzhash` +- Updated `bootstrap` and `ipfs-css` ### Deprecated diff --git a/angular.json b/angular.json index ee65ecf..64341b5 100644 --- a/angular.json +++ b/angular.json @@ -25,12 +25,7 @@ "aot": true, "assets": [ "src/favicon.png", - "src/assets", - { - "glob": "*", - "input": "node_modules/ipfs-css", - "output": "assets/ipfs-css" - } + "src/assets" ], "styles": [ "src/styles.scss" @@ -153,12 +148,7 @@ "karmaConfig": "karma.conf.js", "assets": [ "src/favicon.png", - "src/assets", - { - "glob": "*", - "input": "node_modules/ipfs-css", - "output": "assets/ipfs-css" - } + "src/assets" ], "styles": [ "src/styles.scss" @@ -199,4 +189,4 @@ "packageManager": "yarn", "analytics": "10b848ad-8b81-4346-852f-5eff89573a85" } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 92b0295..9532f69 100644 --- a/package.json +++ b/package.json @@ -24,11 +24,11 @@ "@angular/flex-layout": "^10.0.0-beta.32", "@angular/forms": "~10.0.2", "@angular/material": "^10.0.1", - "@angular/platform-browser": "~10.0.2", "@angular/platform-browser-dynamic": "~10.0.2", + "@angular/platform-browser": "~10.0.2", "@angular/router": "~10.0.2", - "bootstrap": "^4.4.1", - "ipfs-css": "^0.13.1", + "bootstrap": "^4.5.0", + "ipfs-css": "^1.2.0", "rxjs": "~6.6.0", "tslib": "^2.0.0", "zone.js": "~0.10.3" diff --git a/src/styles.scss b/src/styles.scss index b3fa140..fd7f9d7 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -38,3 +38,4 @@ body { } @import '~bootstrap/scss/bootstrap-grid.scss'; +@import '~ipfs-css/theme.scss'; diff --git a/yarn.lock b/yarn.lock index 5fe0f4b..ee16fac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2008,10 +2008,10 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= -bootstrap@^4.4.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz#8582960eea0c5cd2bede84d8b0baf3789c3e8b01" - integrity sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA== +bootstrap@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.0.tgz#97d9dbcb5a8972f8722c9962483543b907d9b9ec" + integrity sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA== brace-expansion@^1.1.7: version "1.1.11" @@ -4712,10 +4712,10 @@ ipaddr.js@^1.9.0: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== -ipfs-css@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/ipfs-css/-/ipfs-css-0.13.1.tgz#f751be9cc89e30c34c50325848233f6da6b6728e" - integrity sha512-hofJSYVBE3VC3/MOYZKfF66SKuHgnYkhXUmPDS8PISI8ygcljGOyBSSU4Je3dfgZX5UHDBEnzq5XyrTU822EDg== +ipfs-css@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ipfs-css/-/ipfs-css-1.2.0.tgz#9e41fc09b40671e0a5834f1be369fa8b717c6092" + integrity sha512-2gnYRkPbgldiXSjdfbMUN2sGLr9DuVaj6nL2aAQvAE5buEj9mhUEkqQ8er6w6uqzlyFWnpSdh5IsiYu4cN4dRw== is-absolute-url@^2.0.0: version "2.1.0"