[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant-backoffice] 03/06: configuring storybook with styling
From: |
gnunet |
Subject: |
[taler-merchant-backoffice] 03/06: configuring storybook with styling |
Date: |
Mon, 08 Feb 2021 21:35:28 +0100 |
This is an automated email from the git hooks/post-receive script.
sebasjm pushed a commit to branch master
in repository merchant-backoffice.
commit a4eb77b8b05c27278a7c099c7152eee8d9afdcee
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Mon Feb 8 17:27:32 2021 -0300
configuring storybook with styling
---
.storybook/main.js | 1 +
.storybook/preview.js | 1 +
package.json | 1 +
src/assets/icons/materialdesignicons-4.9.95.min.css | 3 ---
src/{assets => scss}/fonts/XRXV3I6Li01BKofINeaE.ttf | Bin
src/{assets => scss}/fonts/nunito.css | 2 +-
.../icons/fonts/materialdesignicons-webfont-4.9.95.eot | Bin
.../icons/fonts/materialdesignicons-webfont-4.9.95.ttf | Bin
.../icons/fonts/materialdesignicons-webfont-4.9.95.woff | Bin
.../icons/fonts/materialdesignicons-webfont-4.9.95.woff2 | Bin
src/scss/icons/materialdesignicons-4.9.95.min.css | 3 +++
src/style.scss | 7 -------
src/template.html | 4 +---
yarn.lock | 5 +++++
14 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/.storybook/main.js b/.storybook/main.js
index 26dfeaf..b9dea09 100644
--- a/.storybook/main.js
+++ b/.storybook/main.js
@@ -4,6 +4,7 @@ module.exports = {
"../src/**/*.stories.@(js|jsx|ts|tsx)"
],
"addons": [
+ "@storybook/preset-scss",
"@storybook/addon-links",
"@storybook/addon-essentials"
]
diff --git a/.storybook/preview.js b/.storybook/preview.js
index 5d00c02..15bd64e 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -1,3 +1,4 @@
+import "../src/scss/main.scss"
export const parameters = {
actions: { argTypesRegex: "^on[A-Z].*" },
diff --git a/package.json b/package.json
index 2098077..87f2b37 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
"@storybook/addon-essentials": "^6.1.16",
"@storybook/addon-links": "^6.1.16",
"@storybook/preact": "^6.1.16",
+ "@storybook/preset-scss": "^1.0.3",
"@types/enzyme": "^3.10.5",
"@types/jest": "^26.0.8",
"@typescript-eslint/eslint-plugin": "^2.25.0",
diff --git a/src/assets/icons/materialdesignicons-4.9.95.min.css
b/src/assets/icons/materialdesignicons-4.9.95.min.css
deleted file mode 100644
index f7981c3..0000000
--- a/src/assets/icons/materialdesignicons-4.9.95.min.css
+++ /dev/null
@@ -1,3 +0,0 @@
-@font-face{font-family:"Material Design
Icons";src:url("/assets/icons/fonts/materialdesignicons-webfont-4.9.95.eot");src:url("/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff2")
format("woff2"),url("/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff")
format("woff"),url("/assets/icons/fonts/materialdesignicons-webfont-4.9.95.ttf")
format("truetype");font-weight:normal;font-style:normal}.mdi:before,.mdi-set{display:inline-block;font:normal
normal normal 24px/1 "Materia [...]
-
-/*# sourceMappingURL=materialdesignicons.css.map */
diff --git a/src/assets/fonts/XRXV3I6Li01BKofINeaE.ttf
b/src/scss/fonts/XRXV3I6Li01BKofINeaE.ttf
similarity index 100%
rename from src/assets/fonts/XRXV3I6Li01BKofINeaE.ttf
rename to src/scss/fonts/XRXV3I6Li01BKofINeaE.ttf
diff --git a/src/assets/fonts/nunito.css b/src/scss/fonts/nunito.css
similarity index 53%
rename from src/assets/fonts/nunito.css
rename to src/scss/fonts/nunito.css
index 5a6fb2c..ba965de 100644
--- a/src/assets/fonts/nunito.css
+++ b/src/scss/fonts/nunito.css
@@ -2,5 +2,5 @@
font-family: 'Nunito';
font-style: normal;
font-weight: 400;
- src: url(/assets/fonts/XRXV3I6Li01BKofINeaE.ttf) format('truetype');
+ src: url(./XRXV3I6Li01BKofINeaE.ttf) format('truetype');
}
diff --git a/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.eot
b/src/scss/icons/fonts/materialdesignicons-webfont-4.9.95.eot
similarity index 100%
rename from src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.eot
rename to src/scss/icons/fonts/materialdesignicons-webfont-4.9.95.eot
diff --git a/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.ttf
b/src/scss/icons/fonts/materialdesignicons-webfont-4.9.95.ttf
similarity index 100%
rename from src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.ttf
rename to src/scss/icons/fonts/materialdesignicons-webfont-4.9.95.ttf
diff --git a/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff
b/src/scss/icons/fonts/materialdesignicons-webfont-4.9.95.woff
similarity index 100%
rename from src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff
rename to src/scss/icons/fonts/materialdesignicons-webfont-4.9.95.woff
diff --git a/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff2
b/src/scss/icons/fonts/materialdesignicons-webfont-4.9.95.woff2
similarity index 100%
rename from src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff2
rename to src/scss/icons/fonts/materialdesignicons-webfont-4.9.95.woff2
diff --git a/src/scss/icons/materialdesignicons-4.9.95.min.css
b/src/scss/icons/materialdesignicons-4.9.95.min.css
new file mode 100644
index 0000000..24a89d6
--- /dev/null
+++ b/src/scss/icons/materialdesignicons-4.9.95.min.css
@@ -0,0 +1,3 @@
+@font-face{font-family:"Material Design
Icons";src:url("./fonts/materialdesignicons-webfont-4.9.95.eot");src:url("./fonts/materialdesignicons-webfont-4.9.95.woff2")
format("woff2"),url("./fonts/materialdesignicons-webfont-4.9.95.woff")
format("woff"),url("./fonts/materialdesignicons-webfont-4.9.95.ttf")
format("truetype");font-weight:normal;font-style:normal}.mdi:before,.mdi-set{display:inline-block;font:normal
normal normal 24px/1 "Material Design Icons";font-size:inherit;text-rendering
[...]
+
+/*# sourceMappingURL=materialdesignicons.css.map */
diff --git a/src/style.scss b/src/style.scss
deleted file mode 100644
index 81fb1bc..0000000
--- a/src/style.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@charset "utf-8";
-// Import *all* of Bulma - refer to the customization guide for more info on
customizing Bulma:
-// https://bulma.io/documentation/customize/
-@import "~bulma/bulma";
-@import "~bulma/sass/utilities/initial-variables.sass";
-@import "~bulma/sass/utilities/_all.sass";
-@import "~bulma/sass/elements/_all.sass";
diff --git a/src/template.html b/src/template.html
index c1625a9..49c1c88 100644
--- a/src/template.html
+++ b/src/template.html
@@ -7,9 +7,7 @@
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">
<link rel="apple-touch-icon"
href="/assets/icons/apple-touch-icon.png">
- <link rel="stylesheet" type="text/css"
href="/assets/fonts/nunito.css" >
- <link rel="stylesheet" type="text/css"
href="/assets/icons/materialdesignicons-4.9.95.min.css" >
- <% preact.headEnd %>
+ <% preact.headEnd %>
</head>
<body>
<% preact.bodyEnd %>
diff --git a/yarn.lock b/yarn.lock
index ba0e0f8..8fdddeb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1954,6 +1954,11 @@
regenerator-runtime "^0.13.7"
ts-dedent "^2.0.0"
+"@storybook/preset-scss@^1.0.3":
+ version "1.0.3"
+ resolved
"https://registry.yarnpkg.com/@storybook/preset-scss/-/preset-scss-1.0.3.tgz#8ac834545c642dada0f64f510ef08dfb882e9737"
+ integrity
sha512-o9Iz6wxPeNENrQa2mKlsDKynBfqU2uWaRP80HeWp4TkGgf7/x3DVF2O7yi9N0x/PI1qzzTTpxlQ90D62XmpiTw==
+
"@storybook/router@6.1.17":
version "6.1.17"
resolved
"https://registry.yarnpkg.com/@storybook/router/-/router-6.1.17.tgz#96746878c50c6c97c7de5a1b23a9503c5d648775"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant-backoffice] branch master updated (379e8f2 -> e1bc057), gnunet, 2021/02/08
- [taler-merchant-backoffice] 04/06: missing babelrc for storybook, gnunet, 2021/02/08
- [taler-merchant-backoffice] 01/06: added icons, gnunet, 2021/02/08
- [taler-merchant-backoffice] 02/06: removing stories directory, gnunet, 2021/02/08
- [taler-merchant-backoffice] 03/06: configuring storybook with styling,
gnunet <=
- [taler-merchant-backoffice] 05/06: removed until needed, gnunet, 2021/02/08
- [taler-merchant-backoffice] 06/06: working on instances listing, gnunet, 2021/02/08