From 9aaac69e29030c3800c34799a2d380c94ca30dd5 Mon Sep 17 00:00:00 2001 From: Adrian Simmons Date: Tue, 23 Nov 2021 21:48:54 +0000 Subject: [PATCH] Broken: Replace bulma-css-variables with @bulvar/bulma --- package.json | 2 +- src/styles/common-imports.scss | 2 +- src/styles/global.scss | 108 ++++++++++++++++----------------- yarn.lock | 10 +-- 4 files changed, 61 insertions(+), 61 deletions(-) diff --git a/package.json b/package.json index aa516ad80..3439849aa 100644 --- a/package.json +++ b/package.json @@ -17,13 +17,13 @@ "browserslist:update": "npx browserslist@latest --update-db" }, "dependencies": { + "@bulvar/bulma": "^0.9.3", "@github/hotkey": "1.6.0", "@kyvg/vue3-notification": "2.3.4", "@sentry/tracing": "6.15.0", "@sentry/vue": "6.15.0", "@vue/compat": "3.2.22", "@vueuse/core": "7.0.1", - "bulma-css-variables": "0.9.33", "camel-case": "4.1.2", "codemirror": "5.64.0", "copy-to-clipboard": "3.3.1", diff --git a/src/styles/common-imports.scss b/src/styles/common-imports.scss index 2ac71b2c0..bfcbfe6b6 100644 --- a/src/styles/common-imports.scss +++ b/src/styles/common-imports.scss @@ -11,7 +11,7 @@ // // the default values get overwritten by the definitions above -@import "bulma-css-variables/sass/utilities/_all"; +@import "@bulvar/bulma/sass/utilities/_all"; // since $tablet is defined by bulma we can just define it after importing the utilities $mobile: math.div($tablet, 2); diff --git a/src/styles/global.scss b/src/styles/global.scss index b19c21908..f4bea3171 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -10,73 +10,73 @@ // with the expeption of the bulma utilities – They are // imported globally in common-imports.scss -// imports from "bulma-css-variables/sass/base/_all"; -@import "bulma-css-variables/sass/base/minireset"; -@import "bulma-css-variables/sass/base/generic"; -@import "bulma-css-variables/sass/base/animations"; +// imports from "@bulvar/bulma/sass/base/_all"; +@import "@bulvar/bulma/sass/base/minireset"; +@import "@bulvar/bulma/sass/base/generic"; +@import "@bulvar/bulma/sass/base/animations"; -// imports from "bulma-css-variables/sass/elements/_all"; -@import "bulma-css-variables/sass/elements/box"; -@import "bulma-css-variables/sass/elements/button"; -@import "bulma-css-variables/sass/elements/container"; -@import "bulma-css-variables/sass/elements/content"; -@import "bulma-css-variables/sass/elements/icon"; -@import "bulma-css-variables/sass/elements/image"; -@import "bulma-css-variables/sass/elements/notification"; -@import "bulma-css-variables/sass/elements/progress"; -@import "bulma-css-variables/sass/elements/table"; -@import "bulma-css-variables/sass/elements/tag"; -@import "bulma-css-variables/sass/elements/title"; +// imports from "@bulvar/bulma/sass/elements/_all"; +@import "@bulvar/bulma/sass/elements/box"; +@import "@bulvar/bulma/sass/elements/button"; +@import "@bulvar/bulma/sass/elements/container"; +@import "@bulvar/bulma/sass/elements/content"; +@import "@bulvar/bulma/sass/elements/icon"; +@import "@bulvar/bulma/sass/elements/image"; +@import "@bulvar/bulma/sass/elements/notification"; +@import "@bulvar/bulma/sass/elements/progress"; +@import "@bulvar/bulma/sass/elements/table"; +@import "@bulvar/bulma/sass/elements/tag"; +@import "@bulvar/bulma/sass/elements/title"; -@import "bulma-css-variables/sass/elements/other"; +@import "@bulvar/bulma/sass/elements/other"; -// imports from "bulma-css-variables/sass/form/_all"; -@import "bulma-css-variables/sass/form/shared"; -@import "bulma-css-variables/sass/form/input-textarea"; -@import "bulma-css-variables/sass/form/checkbox-radio"; -@import "bulma-css-variables/sass/form/select"; -@import "bulma-css-variables/sass/form/file"; -@import "bulma-css-variables/sass/form/tools"; +// imports from "@bulvar/bulma/sass/form/_all"; +@import "@bulvar/bulma/sass/form/shared"; +@import "@bulvar/bulma/sass/form/input-textarea"; +@import "@bulvar/bulma/sass/form/checkbox-radio"; +@import "@bulvar/bulma/sass/form/select"; +@import "@bulvar/bulma/sass/form/file"; +@import "@bulvar/bulma/sass/form/tools"; -// imports from "bulma-css-variables/sass/components/_all"; -// @import "bulma-css-variables/sass/components/breadcrumb"; // not used -@import "bulma-css-variables/sass/components/card"; -@import "bulma-css-variables/sass/components/dropdown"; -// @import "bulma-css-variables/sass/components/level"; // not used -@import "bulma-css-variables/sass/components/media"; -@import "bulma-css-variables/sass/components/menu"; -@import "bulma-css-variables/sass/components/message"; -@import "bulma-css-variables/sass/components/modal"; -@import "bulma-css-variables/sass/components/navbar"; -@import "bulma-css-variables/sass/components/pagination"; -// @import "bulma-css-variables/sass/components/panel"; // not used -// @import "bulma-css-variables/sass/components/tabs"; // not used +// imports from "@bulvar/bulma/sass/components/_all"; +// @import "@bulvar/bulma/sass/components/breadcrumb"; // not used +@import "@bulvar/bulma/sass/components/card"; +@import "@bulvar/bulma/sass/components/dropdown"; +// @import "@bulvar/bulma/sass/components/level"; // not used +@import "@bulvar/bulma/sass/components/media"; +@import "@bulvar/bulma/sass/components/menu"; +@import "@bulvar/bulma/sass/components/message"; +@import "@bulvar/bulma/sass/components/modal"; +@import "@bulvar/bulma/sass/components/navbar"; +@import "@bulvar/bulma/sass/components/pagination"; +// @import "@bulvar/bulma/sass/components/panel"; // not used +// @import "@bulvar/bulma/sass/components/tabs"; // not used -// imports from "bulma-css-variables/sass/grid/_all"; -@import "bulma-css-variables/sass/grid/columns"; -// @import "bulma-css-variables/sass/grid/tiles"; // not used +// imports from "@bulvar/bulma/sass/grid/_all"; +@import "@bulvar/bulma/sass/grid/columns"; +// @import "@bulvar/bulma/sass/grid/tiles"; // not used -// imports from "bulma-css-variables/sass/helpers/_all"; -@import "bulma-css-variables/sass/helpers/color"; -@import "bulma-css-variables/sass/helpers/flexbox"; -@import "bulma-css-variables/sass/helpers/float"; -// @import "bulma-css-variables/sass/helpers/other"; // not used -// @import "bulma-css-variables/sass/helpers/overflow"; -// @import "bulma-css-variables/sass/helpers/position"; -@import "bulma-css-variables/sass/helpers/spacing"; -@import "bulma-css-variables/sass/helpers/typography"; -@import "bulma-css-variables/sass/helpers/visibility"; +// imports from "@bulvar/bulma/sass/helpers/_all"; +@import "@bulvar/bulma/sass/helpers/color"; +@import "@bulvar/bulma/sass/helpers/flexbox"; +@import "@bulvar/bulma/sass/helpers/float"; +// @import "@bulvar/bulma/sass/helpers/other"; // not used +// @import "@bulvar/bulma/sass/helpers/overflow"; +// @import "@bulvar/bulma/sass/helpers/position"; +@import "@bulvar/bulma/sass/helpers/spacing"; +@import "@bulvar/bulma/sass/helpers/typography"; +@import "@bulvar/bulma/sass/helpers/visibility"; -// imports from "bulma-css-variables/sass/layout/_all"; -// @import "bulma-css-variables/sass/layout/hero"; // not used -// @import "bulma-css-variables/sass/layout/section"; // not used -@import "bulma-css-variables/sass/layout/footer"; +// imports from "@bulvar/bulma/sass/layout/_all"; +// @import "@bulvar/bulma/sass/layout/hero"; // not used +// @import "@bulvar/bulma/sass/layout/section"; // not used +@import "@bulvar/bulma/sass/layout/footer"; // ################# // END BULMA IMPORTS diff --git a/yarn.lock b/yarn.lock index ae501e751..7b0aa6ed4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1739,6 +1739,11 @@ resolved "https://registry.yarnpkg.com/@bugsnag/safe-json-stringify/-/safe-json-stringify-6.0.0.tgz#22abdcd83e008c369902976730c34c150148a758" integrity sha512-htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA== +"@bulvar/bulma@^0.9.3": + version "0.9.3" + resolved "https://registry.yarnpkg.com/@bulvar/bulma/-/bulma-0.9.3.tgz#4f8176cf2cfca617b96f72ef80475304d0371819" + integrity sha512-5jGwBhQOX8lp3sTZyKUcFt0UHJWJ7XNfC2ANcBM7OZ0BEfjKreCM1WOTdyG3dTI9kEAEYoSBgkzkh3g6LofACA== + "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b" @@ -4651,11 +4656,6 @@ builtins@^1.0.3: resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= -bulma-css-variables@0.9.33: - version "0.9.33" - resolved "https://registry.yarnpkg.com/bulma-css-variables/-/bulma-css-variables-0.9.33.tgz#b249c3410e9edcfa7a5ce8ca96049b6939fe92de" - integrity sha512-D85dXLyLOBBDCuSSOeASc0kN2IknJqo5hzkZ22hxDHobxko/qay0nD+zNl2CJtF8v/7iwvQXqzVSDRnFVRSg9A== - byline@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"