Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: tokenisation & prose cleanup finish #510

Merged
merged 5 commits into from
Jun 24, 2021
Merged

fix: tokenisation & prose cleanup finish #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29588c8
ProseOl
bdrtsky Jun 23, 2021
5b9f14f
ProseStrong
bdrtsky Jun 23, 2021
73b844a
ProseTable
bdrtsky Jun 23, 2021
dba6a29
ProseTd
bdrtsky Jun 23, 2021
26f82af
ProseUl
bdrtsky Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions src/defaultTheme/components/atoms/prose/ProseOl.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,10 @@ ol[type='1'] {
}

ol {
margin-left: 0px;
margin-right: 0px;
padding: 0px;
margin-top: 1.25em;
margin-bottom: 1.25em;
list-style-type: none;

@apply mx-0 p-0 my-[1.25em] list-none;
ul,
ol {
margin-top: 0.5em;
margin-bottom: 0.5em;
@apply my-[0.5em];
}
}
</style>
14 changes: 2 additions & 12 deletions src/defaultTheme/components/atoms/prose/ProseStrong.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,9 @@

<style lang="postcss" scoped>
strong {
/* color: theme('colors.gray.900'); */
font-weight: theme('fontWeight.semibold');
@apply font-semibold;
}
a strong {
color: inherit;
}

.dark {
/* strong {
color: theme('colors.gray.100');
} */
a strong {
color: inherit;
}
@apply text-current;
}
</style>
7 changes: 1 addition & 6 deletions src/defaultTheme/components/atoms/prose/ProseTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@

<style lang="postcss" scoped>
table {
/* TODO */
@apply leading-5;
font-size: 0.875rem;
width: 100%;
table-layout: auto;
text-align: left;
@apply leading-5 text-sm w-full table-auto text-left;
}
</style>
13 changes: 1 addition & 12 deletions src/defaultTheme/components/atoms/prose/ProseTd.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,7 @@
</template>

<style lang="postcss" scoped>
/* TODO */
tbody td {
vertical-align: top;
padding-top: 0.5714286em;
padding-right: 0.5714286em;
padding-bottom: 0.5714286em;
padding-left: 0.5714286em;
&:first-child {
padding-left: 0;
}
&:last-child {
padding-right: 0;
}
@apply align-top first:pl-0 last:pr-0 p-[0.5em];
}
</style>
11 changes: 2 additions & 9 deletions src/defaultTheme/components/atoms/prose/ProseUl.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,10 @@

<style lang="postcss" scoped>
ul {
margin-left: 0px;
margin-right: 0px;
padding: 0px;
margin-top: 1.25em;
margin-bottom: 1.25em;
list-style-type: none;

@apply list-none mx-0 p-0 my-[1.25em];
ul,
ol {
margin-top: 0.5em;
margin-bottom: 0.5em;
@apply my-[0.5em];
}
}
</style>