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

Jump to bottom

Feat: Add Missing AsciiDoc Blockquotes to Markdown Editor #7390

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Feat: Add Missing AsciiDoc Blockquotes to Markdown Editor #7390

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2fdfa7a
start branch
BPowell76 Oct 15, 2024
8039f22
Feat: Added missing Asciidoc blockquotes to markdown editor
BPowell76 Oct 16, 2024
b201f3a
Added styling for SUCCESS AsciiDoc admonition box.
BPowell76 Oct 29, 2024
101dd11
Add SUCCESS blockquote option to adoc editor
BPowell76 Oct 30, 2024
155087a
Added basic asciidoc extension for [SUCCESS] block admonition. Need t…
BPowell76 Nov 1, 2024
378481e
Changed SUCCESS blockquote adoc option to return a block as AsciiDoct…
BPowell76 Nov 3, 2024
32750e0
Fixed issue with admonition block backgroud color appearing in rounde…
BPowell76 Nov 3, 2024
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
2 changes: 1 addition & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"vue"
],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"i18n-ally.localesPaths": [
"server/locales"
Expand Down
9 changes: 5 additions & 4 deletions client/components/editor/editor-asciidoc.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
v-list-item(@click='insertBeforeEachLine({ content: `NOTE: `})')
v-list-item-action
v-icon(color='blue') mdi-alpha-n-box-outline
v-list-item-title {{'Note blockquote'}}
v-list-item-title {{'Note Blockquote'}}
v-divider
v-list-item(@click='insertBeforeEachLine({ content: `TIP: `})')
v-list-item-action
v-icon(color='success') mdi-alpha-t-box-outline
v-list-item-title {{'Tip blockquote'}}
v-list-item-title {{'Tip Blockquote'}}
v-divider
v-list-item(@click='insertBeforeEachLine({ content: `WARNING: `})')
v-list-item-action
Expand All @@ -66,11 +66,12 @@
v-list-item(@click='insertBeforeEachLine({ content: `CAUTION: `})')
v-list-item-action
v-icon(color='purple') mdi-alpha-c-box-outline
v-list-item-title {{'Caution blockquote'}}
v-list-item-title {{'Caution Blockquote'}}
v-divider
v-list-item(@click='insertBeforeEachLine({ content: `IMPORTANT: `})')
v-list-item-action
v-icon(color='error') mdi-alpha-i-box-outline
v-list-item-title {{'Important blockquote'}}
v-list-item-title {{'Important Blockquote'}}
v-divider
template(v-if='$vuetify.breakpoint.mdAndUp')
v-spacer
Expand Down
10 changes: 10 additions & 0 deletions client/components/editor/editor-markdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,21 @@
v-icon(color='success') mdi-alpha-s-box-outline
v-list-item-title {{$t('editor:markup.blockquoteSuccess')}}
v-divider
v-list-item(@click='insertBeforeEachLine({ content: `> `, after: `{.is-tip}`})')
v-list-item-action
v-icon(color='success') mdi-alpha-t-box-outline
v-list-item-title {{'Tip Blockquote'}}
v-divider
v-list-item(@click='insertBeforeEachLine({ content: `> `, after: `{.is-warning}`})')
v-list-item-action
v-icon(color='warning') mdi-alpha-w-box-outline
v-list-item-title {{$t('editor:markup.blockquoteWarning')}}
v-divider
v-list-item(@click='insertBeforeEachLine({ content: `> `, after: `{.is-caution}`})')
v-list-item-action
v-icon(color='purple') mdi-alpha-c-box-outline
v-list-item-title {{'Caution Blockquote'}}
v-divider
v-list-item(@click='insertBeforeEachLine({ content: `> `, after: `{.is-danger}`})')
v-list-item-action
v-icon(color='error') mdi-alpha-e-box-outline
Expand Down
54 changes: 47 additions & 7 deletions client/themes/default/scss/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,9 @@
}

blockquote {
padding: 0 1rem 1rem 1rem;
padding: 0 1rem 0.8rem 1rem;
background-color: mc('blue-grey', '50');
border-left: 55px solid mc('blue-grey', '500');
border-left: 52px solid mc('blue-grey', '500');
border-radius: .5rem;
margin: 1rem 0;
position: relative;
Expand All @@ -255,12 +255,12 @@

&::before {
display: inline-block;
font: normal normal normal 24px/1 "Material Design Icons", sans-serif;
font: normal normal normal 28px/1 "Material Design Icons", sans-serif;
position: absolute;
margin-top: -12px;
top: 50%;
left: -38px;
color: rgba(255, 255, 255, .7);
left: -39px;
color: rgba(255, 255, 255, 0.85);
content: "\F0757";
}

Expand Down Expand Up @@ -354,6 +354,46 @@
border-color: mc('green', '500');
}
}
&.is-tip {
background-color: mc('green', '50');
border-color: mc('green', '300');
color: mc('green', '900');

&::before {
content: "\F0335";
}

code:not([class^="language-"]) {
background-color: mc('green', '50');
color: mc('green', '800');
}

@at-root .theme--dark & {
background-color: mc('green', '900');
color: mc('green', '50');
border-color: mc('green', '500');
}
}
&.is-caution {
background-color: mc('purple', '50');
border-color: mc('purple', '300');
color: mc('purple', '900');

&::before {
content: "\f0238";
}

code:not([class^="language-"]) {
background-color: mc('purple', '50');
color: mc('purple', '800');
}

@at-root .theme--dark & {
background-color: mc('purple', '900');
color: mc('purple', '50');
border-color: mc('purple', '500');
}
}
}

// ---------------------------------
Expand All @@ -378,7 +418,7 @@

&::before {
display: inline-block;
font: normal normal normal 24px/1 "Material Design Icons", sans-serif !important;
font: normal normal normal 28px/1 "Material Design Icons", sans-serif !important;
}
}

Expand Down Expand Up @@ -685,7 +725,7 @@
display:inline-block;
vertical-align:top;
padding-top:0;

&:first-child {
width: 100%;
}
Expand Down