Skip to content

Commit a8e9fa9

Browse files
dzungleedzunglee
authored
Merge pull request #25 from ltv/new-typography
New typography
2 parents 7012722 + c37050b commit a8e9fa9

File tree

4 files changed

+19
-20
lines changed

4 files changed

+19
-20
lines changed

‎components.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ declare module 'vue' {
66
export interface GlobalComponents {
77
ElButton: typeof import('element-plus/es')['ElButton']
88
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
9-
ElDivider: typeof import('element-plus/es')['ElDivider']
109
ElIcon: typeof import('element-plus/es')['ElIcon']
11-
ElRow: typeof import('element-plus/es')['ElRow']
1210
Main: typeof import('./src/components/Main/index.vue')['default']
1311
Navigation: typeof import('./src/components/Navigation/index.vue')['default']
1412
Sidebar: typeof import('./src/components/Sidebar/index.vue')['default']

‎src/assets/css/typography.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ body {
33
@apply bg-white break-words w-full sm:w-3/4 md:w-3/4 mx-auto mt-5 mb-2 shadow rounded-lg flex flex-col
44
}
55
.card-header {
6-
@apply p-5 border-b
6+
@apply p-5 border-b border-primary-white
77
}
88
.row {
99
@apply my-8 w-full h-auto

‎src/modules/typography/views/index.vue

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<span class="title block">Heading 1</span>
1212
</div>
1313
<div class="md:w-3/4">
14-
<h1>Fancy Dasboard</h1>
14+
<h1>Fancy Dashboard</h1>
1515
</div>
1616
</div>
1717
<!-- Heading 2 -->
@@ -20,7 +20,7 @@
2020
<span class="title block">Heading 2</span>
2121
</div>
2222
<div class="md:w-3/4">
23-
<h2>Fancy Dasboard</h2>
23+
<h2>Fancy Dashboard</h2>
2424
</div>
2525
</div>
2626
<!-- Heading 3 -->
@@ -29,7 +29,7 @@
2929
<span class="title block">Heading 3</span>
3030
</div>
3131
<div class="md:w-3/4">
32-
<h3>Fancy Dasboard</h3>
32+
<h3>Fancy Dashboard</h3>
3333
</div>
3434
</div>
3535
<!-- Heading 4 -->
@@ -38,7 +38,7 @@
3838
<span class="title block">Heading 4</span>
3939
</div>
4040
<div class="md:w-3/4">
41-
<h4>Fancy Dasboard</h4>
41+
<h4>Fancy Dashboard</h4>
4242
</div>
4343
</div>
4444
<!-- Heading 5 -->
@@ -47,7 +47,7 @@
4747
<span class="title block">Heading 5</span>
4848
</div>
4949
<div class="md:w-3/4">
50-
<h5>Fancy Dasboard</h5>
50+
<h5>Fancy Dashboard</h5>
5151
</div>
5252
</div>
5353
<!-- Heading 6 -->
@@ -56,7 +56,7 @@
5656
<span class="title block">Heading 6</span>
5757
</div>
5858
<div class="md:w-3/4">
59-
<h6>Fancy Dasboard</h6>
59+
<h6>Fancy Dashboard</h6>
6060
</div>
6161
</div>
6262
</div>
@@ -74,34 +74,34 @@
7474
<span class="title block">Display 1</span>
7575
</div>
7676
<div class="md:w-3/4">
77-
<h1 class="display-1">Fancy Dasboard</h1>
77+
<h1 class="display-1">Fancy Dashboard</h1>
7878
</div>
7979
</div>
8080
<!-- Display 2 -->
8181
<div class="row medium">
8282
<div class="md:w-1/4">
83-
<span class="title block">Heading 2</span>
83+
<span class="title block">Display 2</span>
8484
</div>
8585
<div class="md:w-3/4">
86-
<h2 class="display-2">Fancy Dasboard</h2>
86+
<h2 class="display-2">Fancy Dashboard</h2>
8787
</div>
8888
</div>
8989
<!-- Heading 3 -->
9090
<div class="row medium">
9191
<div class="md:w-1/4">
92-
<span class="title block">Heading 3</span>
92+
<span class="title block">Display 3</span>
9393
</div>
9494
<div class="md:w-3/4">
95-
<h3 class="display-3">Fancy Dasboard</h3>
95+
<h3 class="display-3">Fancy Dashboard</h3>
9696
</div>
9797
</div>
9898
<!-- Heading 4 -->
9999
<div class="row medium">
100100
<div class="md:w-1/4">
101-
<span class="title block">Heading 4</span>
101+
<span class="title block">Display 4</span>
102102
</div>
103103
<div class="md:w-3/4">
104-
<h4 class="display-4">Fancy Dasboard</h4>
104+
<h4 class="display-4">Fancy Dashboard</h4>
105105
</div>
106106
</div>
107107
</div>
@@ -119,7 +119,7 @@
119119
<span class="title block">Heading</span>
120120
</div>
121121
<div class="md:w-3/4">
122-
<h3 class="heading">Fancy Dasboard</h3>
122+
<h3 class="heading">Fancy Dashboard</h3>
123123
</div>
124124
</div>
125125
<!-- Heading title -->
@@ -128,7 +128,7 @@
128128
<span class="title block">Heading Title</span>
129129
</div>
130130
<div class="md:w-3/4">
131-
<h2 class="heading-title text-warning">Fancy Dasboard</h2>
131+
<h2 class="heading-title text-warning">Fancy Dashboard</h2>
132132
</div>
133133
</div>
134134
<!-- Heading section -->
@@ -137,7 +137,7 @@
137137
<span class="title block">Heading Section</span>
138138
</div>
139139
<div class="md:w-3/4">
140-
<h3 class="display-3">Fancy Dasboard</h3>
140+
<h3 class="display-3">Fancy Dashboard</h3>
141141
</div>
142142
</div>
143143
<!-- -->
@@ -146,7 +146,7 @@
146146
<span class="title block"></span>
147147
</div>
148148
<div class="md:w-3/4">
149-
<h4 class="lead text-muted">Fancy Dasboard</h4>
149+
<h4 class="lead text-muted">Fancy Dashboard</h4>
150150
</div>
151151
</div>
152152
</div>

‎tailwind.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ module.exports = {
2020
200: 'rgb(136 152 170)',
2121
blue: 'rgb(94 114 228)',
2222
red: 'rgb(245 54 92)',
23+
white: 'rgba(0, 0, 0, 0.05)',
2324
},
2425
muted: {
2526
DEFAULT: 'rgb(136 152 170)',

0 commit comments

Comments
 (0)