Skip to content

Bootstrap 5: Migrate badges #1884

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

Merged
jonahtanjz merged 7 commits into from
Apr 7, 2022
Merged

Bootstrap 5: Migrate badges #1884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3bfb44
badges: .badge-pill -> .rounded-pill
jovyntls Apr 5, 2022
1037b06
badges: .badge-* -> .bg-*
jovyntls Apr 5, 2022
3bcd940
badges: add .text-dark
jovyntls Apr 5, 2022
5418882
Merge branch 'master' of github.com:MarkBind/markbind into b5-badges
jovyntls Apr 7, 2022
7702ea0
Fix missing text-dark
jovyntls Apr 7, 2022
79935d6
Update tests
jovyntls Apr 7, 2022
82a6f2b
Merge branch 'bootstrap-v5-migration' of github.com:MarkBind/markbind…
jovyntls Apr 7, 2022
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
4 changes: 2 additions & 2 deletions docs/_markbind/variables.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<variable name="icon_bulb_blue"><span style="color: {{ markbind_blue }}">:fas-lightbulb:</span></variable>
<variable name="icon_dislike">:fas-thumbs-down:</variable>
<variable id="icon_embedding"><md>:glyphicon-log-in:</md></variable>
<variable name="icon_example">++<span class='badge badge-pill badge-secondary' style="padding-bottom: 4px; margin-right: 5px;">Example</span>++</variable>
<variable name="icon_examples">++<span class='badge badge-pill badge-secondary' style="padding-bottom: 4px;">Examples</span>++</variable>
<variable name="icon_example">++<span class='badge rounded-pill bg-secondary' style="padding-bottom: 4px; margin-right: 5px;">Example</span>++</variable>
<variable name="icon_examples">++<span class='badge rounded-pill bg-secondary' style="padding-bottom: 4px;">Examples</span>++</variable>
<variable name="icon_info">:fas-info-circle:</variable>
<variable name="icon_ticked">:far-check-square:</variable>

Expand Down
56 changes: 28 additions & 28 deletions docs/userGuide/syntax/badges.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
<variable name="highlightStyle">html</variable>
<variable name="code">
Normal:
<span class="badge badge-primary">Primary</span>
<span class="badge badge-secondary">Secondary</span>
<span class="badge badge-success">Success</span>
<span class="badge badge-danger">Danger</span>
<span class="badge badge-warning">Warning</span>
<span class="badge badge-info">Info</span>
<span class="badge badge-light">Light</span>
<span class="badge badge-dark">Dark</span>
<span class="badge bg-primary">Primary</span>
<span class="badge bg-secondary">Secondary</span>
<span class="badge bg-success">Success</span>
<span class="badge bg-danger">Danger</span>
<span class="badge bg-warning text-dark">Warning</span>
<span class="badge bg-info text-dark">Info</span>
<span class="badge bg-light text-dark">Light</span>
<span class="badge bg-dark">Dark</span>
<br>Pills:
<span class="badge badge-pill badge-primary">Primary</span>
<span class="badge badge-pill badge-secondary">Secondary</span>
<span class="badge badge-pill badge-success">Success</span>
<span class="badge badge-pill badge-danger">Danger</span>
<span class="badge badge-pill badge-warning">Warning</span>
<span class="badge badge-pill badge-info">Info</span>
<span class="badge badge-pill badge-light">Light</span>
<span class="badge badge-pill badge-dark">Dark</span>
<span class="badge rounded-pill bg-primary">Primary</span>
<span class="badge rounded-pill bg-secondary">Secondary</span>
<span class="badge rounded-pill bg-success">Success</span>
<span class="badge rounded-pill bg-danger">Danger</span>
<span class="badge rounded-pill bg-warning text-dark">Warning</span>
<span class="badge rounded-pill bg-info text-dark">Info</span>
<span class="badge rounded-pill bg-light text-dark">Light</span>
<span class="badge rounded-pill bg-dark">Dark</span>
</variable>
</include>

Expand All @@ -30,18 +30,18 @@ You can use Badges in combination with headings, buttons, links, etc.
<variable name="highlightStyle">html</variable>
<variable name="code">
Links:
<a href="#" class="badge badge-primary">Primary</a>
<a href="#" class="badge badge-pill badge-warning">Warning</a>
<a href="#" class="badge bg-primary">Primary</a>
<a href="#" class="badge rounded-pill bg-warning text-dark">Warning</a>

Buttons:
<button type="button" class="btn btn-primary">
Difficulty Level <span class="badge badge-light">4</span>
Difficulty Level <span class="badge bg-light text-dark">4</span>
</button>

Headings:

### Feature X <span class="badge badge-danger">beta</span> {.no-index}
##### Feature Y <span class="badge badge-pill badge-success">stable</span> {.no-index}
### Feature X <span class="badge bg-danger">beta</span> {.no-index}
##### Feature Y <span class="badge rounded-pill bg-success">stable</span> {.no-index}
</variable>
</include>

Expand All @@ -55,20 +55,20 @@ Headings:
<div id="short" class="d-none">

```markdown
<span class="badge badge-primary">Primary</span>
<span class="badge badge-pill badge-success">Success</span>
<span class="badge bg-primary">Primary</span>
<span class="badge rounded-pill bg-success">Success</span>
<button type="button" class="btn btn-primary">
Difficulty Level <span class="badge badge-light">4</span>
Difficulty Level <span class="badge bg-light text-dark">4</span>
</button>
```
</div>

<div id="examples" class="d-none">

<span class="badge badge-primary">Primary</span>
<span class="badge badge-pill badge-success">Success</span>
<span class="badge bg-primary">Primary</span>
<span class="badge rounded-pill bg-success">Success</span>
<button type="button" class="btn btn-primary">
Difficulty Level <span class="badge badge-light">4</span>
##### Feature Y <span class="badge badge-pill badge-warning">stable</span> {.no-index}
Difficulty Level <span class="badge bg-light text-dark">4</span>
##### Feature Y <span class="badge rounded-pill bg-warning text-dark">stable</span> {.no-index}
</button>
</div>
2 changes: 1 addition & 1 deletion packages/cli/test/functional/test_site_templates/test_default/expected/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ <h1 id="heading-1"><span id="heading-1" class="anchor"></span>Heading 1<a class=
</span><span><span class="hljs-tag">&lt;/<span class="hljs-name">foo</span>&gt;</span>
</span></code></pre>
<h2 id="sub-heading-1-1"><span id="sub-heading-1-1" class="anchor"></span>Sub Heading 1.1<a class="fa fa-anchor" href="#sub-heading-1-1" onclick="event.stopPropagation()"></a></h2>
<p>A <tooltip placement="top" trigger="hover"><template #content>❗️ some <strong>important explanation</strong></template>tooltip</tooltip>, a <trigger for="modal:modalinfo" trigger="click">modal</trigger>, a <a href="https://markbind.org/">link</a>, a <span class="badge badge-danger">badge</span>, another <span class="badge badge-warning">badge</span>.</p>
<p>A <tooltip placement="top" trigger="hover"><template #content>❗️ some <strong>important explanation</strong></template>tooltip</tooltip>, a <trigger for="modal:modalinfo" trigger="click">modal</trigger>, a <a href="https://markbind.org/">link</a>, a <span class="badge bg-danger">badge</span>, another <span class="badge bg-warning text-dark">badge</span>.</p>
<modal id="modal:modalinfo"><template #header>Modal Title</template>
Some text some text some text some text some text some text some text. Some text some text some text some text some text some text some text. Some text some text some text some text some text some text some text some text some text some text some text some text some text some text. Some text some text some text some text some text some text. Some text some text some text some text some text some text some text.
</modal>
Expand Down
2 changes: 1 addition & 1 deletion ...es/cli/test/functional/test_site_templates/test_default/expected/index.page-vue-render.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/core/template/default/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Some text some text some text some text some text some text some text. **Some te

## Sub Heading 1.1

A <tooltip content=":exclamation: some **important explanation**" placement="top" trigger="hover">tooltip</tooltip>, a <trigger for="modal:modalinfo" trigger="click">modal</trigger>, a <a href="https://markbind.org/">link</a>, a <span class="badge badge-danger">badge</span>, another <span class="badge badge-warning">badge</span>.
A <tooltip content=":exclamation: some **important explanation**" placement="top" trigger="hover">tooltip</tooltip>, a <trigger for="modal:modalinfo" trigger="click">modal</trigger>, a <a href="https://markbind.org/">link</a>, a <span class="badge bg-danger">badge</span>, another <span class="badge bg-warning text-dark">badge</span>.

<modal header="Modal Title" id="modal:modalinfo">
Some text some text some text some text some text some text some text. Some text some text some text some text some text some text some text. Some text some text some text some text some text some text some text some text some text some text some text some text some text some text. Some text some text some text some text some text some text. Some text some text some text some text some text some text some text.
Expand Down
8 changes: 4 additions & 4 deletions packages/vue-components/src/__tests__/__snapshots__/Questions.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1776,14 +1776,14 @@ exports[`Text Questions of answered correctly with answer, unshown hint without
Keywords: 

<span
class="badge badge-pill badge-light fw-normal"
class="badge rounded-pill bg-light text-dark fw-normal"
>

abc

</span>
<span
class="badge badge-pill badge-light fw-normal"
class="badge rounded-pill bg-light text-dark fw-normal"
>

123
Expand Down Expand Up @@ -1867,14 +1867,14 @@ exports[`Text Questions of answered wrongly with answer, header without hint ren
Keywords: 

<span
class="badge badge-pill badge-light fw-normal"
class="badge rounded-pill bg-light text-dark fw-normal"
>

abc

</span>
<span
class="badge badge-pill badge-light fw-normal"
class="badge rounded-pill bg-light text-dark fw-normal"
>

123
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-components/src/__tests__/__snapshots__/Quiz.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ exports[`Quizzes with text question marked correct shows next button after answe
Keywords: 

<span
class="badge badge-pill badge-light fw-normal"
class="badge rounded-pill bg-light text-dark fw-normal"
>

abc
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-components/src/questions/Question.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<span
v-for="keyword in keywordsSplitTrimmed()"
:key="keyword"
class="badge badge-pill badge-light fw-normal"
class="badge rounded-pill bg-light text-dark fw-normal"
>
{{ keyword }}
</span>
Expand Down