Skip to content

Commit 8c0acfe

Browse files
committedApr 3, 2020
Update typography
1 parent 866a4a1 commit 8c0acfe

39 files changed

+475
-1553
lines changed
 

‎.storybook/preview.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ addDecorator(() => ({
6464

6565
addParameters({
6666
backgrounds: [
67-
{ name: "light", value: "#fff" },
67+
{ name: "white", value: "#fff" },
6868
{ name: "dark-blue", value: "#184f90" },
69-
{ name: "primary", value: "#05c0a5"}
69+
{ name: "light-green", value: "#cdf4ee"}
7070
]
7171
});

‎.storybook/webpack.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const path = require("path");
22

33
// Export a function. Accept the base config as the only param.
44
module.exports = async ({ config, mode }) => {
5+
// storybookBaseConfig.output.publicPath = 'http://localhost:6006/'
56
config.resolve.extensions.push(".vue");
67
config.resolve.alias["@"] = path.resolve(__dirname, "../src");
78
// `mode` has a value of 'DEVELOPMENT' or 'PRODUCTION'

‎package-lock.json

+340-104
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717
"build:umd": "rollup --config build/rollup.config.js --format umd --file dist/mew-components.umd.js",
1818
"build:es": "rollup --config build/rollup.config.js --format es --file dist/mew-components.esm.js",
1919
"build:unpkg": "rollup --config build/rollup.config.js --format iife --file dist/mew-components.min.js",
20-
"storybook": "start-storybook -p 6006",
20+
"storybook": "start-storybook -p 6006 -c .storybook watch-css -s ./src",
2121
"build-storybook": "build-storybook -c .storybook -o .out",
2222
"deploy-storybook": "storybook-to-ghpages"
2323
},
2424
"dependencies": {
25-
"@storybook/addon-viewport": "^5.3.17",
26-
"@storybook/source-loader": "^5.3.17",
2725
"all": "0.0.0",
2826
"core-js": "^2.6.5",
2927
"fibers": "^4.0.2",
@@ -40,6 +38,8 @@
4038
"@storybook/addon-links": "^5.3.17",
4139
"@storybook/addon-docs": "^5.3.18",
4240
"@storybook/addon-knobs": "^5.3.18",
41+
"@storybook/addon-viewport": "^5.3.17",
42+
"@storybook/source-loader": "^5.3.17",
4343
"@storybook/addons": "^5.3.17",
4444
"@storybook/storybook-deployer": "^2.8.3",
4545
"@storybook/vue": "^5.3.17",
@@ -62,7 +62,8 @@
6262
"sass-loader": "^7.1.0",
6363
"vue-cli-plugin-vuetify": "^0.6.3",
6464
"vue-template-compiler": "^2.6.10",
65-
"vuetify-loader": "^1.2.2"
65+
"vuetify-loader": "^1.2.2",
66+
"file-loader": "^6.0.0"
6667
},
6768
"files": [
6869
"dist/*",

‎src/App.vue

+6
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,17 @@ export default {
2424

2525
<style lang="scss">
2626
@import "@/global.scss";
27+
@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap");
2728
2829
* {
2930
color: var(--v-info-base);
3031
}
3132
33+
html,
34+
body {
35+
font-family: "Roboto", sans-serif;
36+
}
37+
3238
.v-application {
3339
code {
3440
color: var(--v-cerise-base) !important;

‎src/components/MewButton/MewButton.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<script>
2929
export default {
30-
name: "MewButton",
30+
name: "MewsButton",
3131
props: {
3232
title: String,
3333
icon: String,
@@ -90,6 +90,8 @@ export default {
9090
</script>
9191

9292
<style lang="scss" scoped>
93+
@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap");
94+
9395
.v-application {
9496
.v-btn {
9597
border-radius: 6px !important;

‎src/global.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ $checkbox--inactive--font-color: $label--inactive--color;
2929

3030
.line-height--medium {
3131
line-height: 20px;
32-
}
32+
}

‎src/typography.scss

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// mew typography
2+
.mew-title {
3+
font-size: 50px;
4+
font-weight: 700;
5+
}
6+
7+
.mew-subtitle {
8+
font-size: 30px;
9+
font-weight: 700;
10+
}
11+
12+
.mew-heading-1 {
13+
font-size: 24px;
14+
font-weight: 700;
15+
}
16+
17+
.mew-heading-2 {
18+
font-size: 22px;
19+
font-weight: 700;
20+
}
21+
22+
.mew-heading-3 {
23+
font-size: 16px;
24+
font-weight: 700;
25+
}
26+
27+
.mew-body {
28+
font-size: 14px;
29+
font-weight: 400;
30+
}
31+
32+
.mew-caption {
33+
font-size: 12px;
34+
font-weight: 700;
35+
}

‎src/views/ColorsView.vue

-135
This file was deleted.

‎src/views/ComponentsView.vue

-368
This file was deleted.

‎src/views/IconsView.vue

-47
This file was deleted.

‎src/views/MainView.vue

-81
This file was deleted.

‎src/views/TypographyView.vue

-46
This file was deleted.

‎src/views/components/FooterComponent.vue

-26
This file was deleted.

‎src/views/components/HeaderComponent.vue

-26
This file was deleted.

‎src/views/containers/ColorContainer.vue

-34
This file was deleted.

‎src/views/containers/ComponentContainer.vue

-19
This file was deleted.

‎stories/MewButton/Basic/Basic.vue

-86
This file was deleted.

‎stories/MewButton/Basic/index.js

-1
This file was deleted.

‎stories/MewButton/Disabled/Disabled.vue

-80
This file was deleted.

‎stories/MewButton/Disabled/index.js

-1
This file was deleted.

‎stories/MewButton/Error/Error.vue

-76
This file was deleted.

‎stories/MewButton/Error/index.js

-1
This file was deleted.

‎stories/MewButton/Primary/Primary.vue

-91
This file was deleted.

‎stories/MewButton/Primary/index.js

-1
This file was deleted.

‎stories/MewButton/Secondary/Secondary.vue

-80
This file was deleted.

‎stories/MewButton/Secondary/index.js

-1
This file was deleted.

‎stories/MewButton/White/White.vue

-82
This file was deleted.

‎stories/MewButton/White/index.js

-1
This file was deleted.

‎stories/MewSuperButton/Basic/Basic.vue

-37
This file was deleted.

‎stories/MewSuperButton/Basic/index.js

-1
This file was deleted.

‎stories/MewSuperButton/Disabled/Disabled.vue

-37
This file was deleted.

‎stories/MewSuperButton/Disabled/index.js

-1
This file was deleted.

‎stories/MewSuperButton/Green/Green.vue

-38
This file was deleted.

‎stories/MewSuperButton/Green/index.js

-1
This file was deleted.

‎stories/MewSuperButton/Outline/Outline.vue

-42
This file was deleted.

‎stories/MewSuperButton/Outline/index.js

-1
This file was deleted.
+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
export default {
2+
title: "Typography"
3+
};
4+
5+
export const All = () => ({
6+
data() {
7+
return {
8+
mewTitle: {
9+
fontSize: "50px",
10+
fontWeight: 700
11+
},
12+
mewSubtitle: {
13+
fontSize: "30px",
14+
fontWeight: 700
15+
},
16+
mewHeading1: {
17+
fontSize: "24px",
18+
fontWeight: 700
19+
},
20+
mewHeading2: {
21+
fontSize: "22px",
22+
fontWeight: 700
23+
},
24+
mewHeading3: {
25+
fontSize: "16px",
26+
fontWeight: 700
27+
},
28+
mewBody: {
29+
fontSize: "14px",
30+
fontWeight: 400
31+
},
32+
mewCaption: {
33+
fontSize: "12px",
34+
fontWeight: 700
35+
},
36+
markupStyle: {
37+
color: "#cfcfcf",
38+
fontSize: "12px",
39+
fontWeight: 700
40+
},
41+
headerStyle: {
42+
color: "#05c0a5",
43+
textTransform: "uppercase",
44+
paddingBottom: "10px"
45+
}
46+
};
47+
},
48+
template: `
49+
<div>
50+
<br/>
51+
<h3 :style="{paddingBottom: '10px'}"><span :style="headerStyle">font-family:</span> <span :style="{ fontWeight: 400 }">Roboto</span></h3>
52+
<h3 :style="headerStyle">classes</h3>
53+
<div :style="mewBody, { fontWeight: 400 }">.font-weight-regular</div>
54+
<div :style="markupStyle">font-weight: 400</div>
55+
<br />
56+
<div :style="mewBody, { fontWeight: 500 }">.font-weight-medium</div>
57+
<div :style="markupStyle">font-weight: 500</div>
58+
<br />
59+
<div :style="mewBody, { fontWeight: 700 }">.font-weight-bold</div>
60+
<div :style="markupStyle">font-weight: 700</div>
61+
<div :style="mewTitle">.mew-title</div>
62+
<div :style="markupStyle">font-size: 50px; font-weight: 700</div>
63+
<br />
64+
<div :style="mewSubtitle">.mew-subtitle</div>
65+
<div :style="markupStyle">font-size: 30px; font-weight: 700</div>
66+
<br />
67+
<div :style="mewHeading1">.mew-heading-1</div>
68+
<div :style="markupStyle">font-size: 24px; font-weight: 700</div>
69+
<br />
70+
<div :style="mewHeading2">.mew-heading-2</div>
71+
<div :style="markupStyle">font-size: 22px; font-weight: 700</div>
72+
<br />
73+
<div :style="mewHeading3">.mew-heading-3</div>
74+
<div :style="markupStyle">font-size: 16px; font-weight: 700</div>
75+
<br />
76+
<div :style="mewBody">.mew-body</div>
77+
<div :style="markupStyle">font-size: 14px; font-weight: 400</div>
78+
<br />
79+
<div :style="mewCaption">.mew-caption</div>
80+
<div :style="markupStyle">font-size: 12px; font-weight: 700</div>
81+
</div>`
82+
});
File renamed without changes.

0 commit comments

Comments
 (0)
Please sign in to comment.