Skip to content

Commit

Permalink
Merge branch 'master' into master-mc-disable
Browse files Browse the repository at this point in the history
  • Loading branch information
@XhmikosR
XhmikosR committed Dec 24, 2019
2 parents 3f7cfcf + fa4dd7e commit 4b2a34f
Show file tree
Hide file tree
Showing 9 changed files with 674 additions and 190 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/test.yml
View file
Expand Up @@ -30,11 +30,10 @@ jobs:
uses: actions/cache@v1
with:
path: ~/.npm
key: ${{ runner.os }}-node-v{{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}-${{ hashFiles('.github/workflows/test.yml') }}
key: ${{ runner.os }}-node-v${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}-${{ hashFiles('.github/workflows/test.yml') }}
restore-keys: |
${{ runner.OS }}-node-v{{ matrix.node }}-${{ env.cache-name }}-
${{ runner.OS }}-node-v{{ matrix.node }}-
${{ runner.OS }}-
${{ runner.OS }}-node-v${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}-${{ hashFiles('.github/workflows/test.yml') }}
${{ runner.OS }}-node-v${{ matrix.node }}-
- name: Install npm dependencies
run: npm ci
Expand Down
9 changes: 6 additions & 3 deletions config.yml
View file
Expand Up @@ -3,9 +3,12 @@ title: "Bootstrap"
baseURL: "https://getbootstrap.com"
enableInlineShortcodes: true

pygmentsUseClasses: true
# you can use ```lang if you want too
pygmentsCodeFences: true
markup:
goldmark:
renderer:
unsafe: true
highlight:
noClasses: false

buildDrafts: true
buildFuture: true
Expand Down
780 changes: 634 additions & 146 deletions package-lock.json
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
View file
Expand Up @@ -86,24 +86,24 @@
"popper.js": "^1.16.0"
},
"devDependencies": {
"@babel/cli": "^7.7.5",
"@babel/core": "^7.7.5",
"@babel/plugin-proposal-object-rest-spread": "^7.7.4",
"@babel/preset-env": "^7.7.6",
"@babel/cli": "^7.7.7",
"@babel/core": "^7.7.7",
"@babel/plugin-proposal-object-rest-spread": "^7.7.7",
"@babel/preset-env": "^7.7.7",
"autoprefixer": "^9.7.3",
"babel-eslint": "^10.0.3",
"babel-plugin-istanbul": "^5.2.0",
"babel-plugin-istanbul": "^6.0.0",
"bundlesize": "^0.18.0",
"clean-css-cli": "^4.3.0",
"cross-env": "^6.0.3",
"eslint": "^6.7.2",
"eslint": "^6.8.0",
"eslint-config-xo": "^0.27.2",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-unicorn": "^13.0.0",
"find-unused-sass-variables": "^1.0.4",
"glob": "^7.1.6",
"hammer-simulator": "0.0.1",
"hugo-bin": "^0.47.1",
"hugo-bin": "^0.50.0",
"ip": "^1.1.5",
"jasmine-core": "^3.5.0",
"karma": "^4.4.1",
Expand All @@ -115,7 +115,7 @@
"karma-jasmine": "^2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"karma-rollup-preprocessor": "^7.0.2",
"linkinator": "^1.8.0",
"linkinator": "^1.8.2",
"node-sass": "^4.13.0",
"nodemon": "^2.0.2",
"npm-run-all": "^4.1.5",
Expand All @@ -130,7 +130,7 @@
"shelljs": "^0.8.3",
"stylelint": "^12.0.0",
"stylelint-config-twbs-bootstrap": "^1.0.0",
"terser": "^4.4.2",
"terser": "^4.4.3",
"vnu-jar": "19.9.4"
},
"engines": {
Expand Down
2 changes: 0 additions & 2 deletions site/content/docs/4.3/components/modal.md
View file
Expand Up @@ -727,7 +727,6 @@ Our default modal without modifier class constitutes the "medium" size modal.
<div class="modal fade bd-example-modal-xl" tabindex="-1" role="dialog" aria-labelledby="myExtraLargeModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl" role="document">
<div class="modal-content">

<div class="modal-header">
<h5 class="modal-title h4" id="myExtraLargeModalLabel">Extra large modal</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
Expand All @@ -744,7 +743,6 @@ Our default modal without modifier class constitutes the "medium" size modal.
<div class="modal fade bd-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">

<div class="modal-header">
<h5 class="modal-title h4" id="myLargeModalLabel">Large modal</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
Expand Down
3 changes: 0 additions & 3 deletions site/content/docs/4.3/components/navbar.md
View file
Expand Up @@ -325,7 +325,6 @@ Theming the navbar has never been easier thanks to the combination of theming cl
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarColor01">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
Expand Down Expand Up @@ -355,7 +354,6 @@ Theming the navbar has never been easier thanks to the combination of theming cl
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor02" aria-controls="navbarColor02" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarColor02">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
Expand Down Expand Up @@ -385,7 +383,6 @@ Theming the navbar has never been easier thanks to the combination of theming cl
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor03" aria-controls="navbarColor03" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarColor03">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
Expand Down
9 changes: 4 additions & 5 deletions site/content/docs/4.3/content/tables.md
View file
Expand Up @@ -457,16 +457,15 @@ Use contextual classes to color table rows or individual cells.
<td>Cell</td>
<td>Cell</td>
</tr>

{{< table.inline >}}
{{- range (index $.Site.Data "theme-colors") }}
{{< table.inline >}}
{{- range (index $.Site.Data "theme-colors") }}
<tr class="table-{{ .name }}">
<th scope="row">{{ .name | title }}</th>
<td>Cell</td>
<td>Cell</td>
</tr>
{{- end -}}
{{< /table.inline >}}
{{- end -}}
{{< /table.inline >}}
</tbody>
</table>
</div>
Expand Down
34 changes: 17 additions & 17 deletions site/content/docs/4.3/examples/checkout/index.html
View file
Expand Up @@ -122,7 +122,7 @@ <h4 class="mb-3">Billing address</h4>
<div class="row">
<div class="col-md-5 mb-3">
<label for="country">Country</label>
<select class="custom-select d-block w-100" id="country" required>
<select class="form-select" id="country" required>
<option value="">Choose...</option>
<option>United States</option>
</select>
Expand All @@ -132,7 +132,7 @@ <h4 class="mb-3">Billing address</h4>
</div>
<div class="col-md-4 mb-3">
<label for="state">State</label>
<select class="custom-select d-block w-100" id="state" required>
<select class="form-select" id="state" required>
<option value="">Choose...</option>
<option>California</option>
</select>
Expand All @@ -149,30 +149,30 @@ <h4 class="mb-3">Billing address</h4>
</div>
</div>
<hr class="mb-4">
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="same-address">
<label class="custom-control-label" for="same-address">Shipping address is the same as my billing address</label>
<div class="form-check">
<input type="checkbox" class="form-check-input" id="same-address">
<label class="form-check-label" for="same-address">Shipping address is the same as my billing address</label>
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="save-info">
<label class="custom-control-label" for="save-info">Save this information for next time</label>
<div class="form-check">
<input type="checkbox" class="form-check-input" id="save-info">
<label class="form-check-label" for="save-info">Save this information for next time</label>
</div>
<hr class="mb-4">

<h4 class="mb-3">Payment</h4>

<div class="d-block my-3">
<div class="custom-control custom-radio">
<input id="credit" name="paymentMethod" type="radio" class="custom-control-input" checked required>
<label class="custom-control-label" for="credit">Credit card</label>
<div class="form-check">
<input id="credit" name="paymentMethod" type="radio" class="form-check-input" checked required>
<label class="form-check-label" for="credit">Credit card</label>
</div>
<div class="custom-control custom-radio">
<input id="debit" name="paymentMethod" type="radio" class="custom-control-input" required>
<label class="custom-control-label" for="debit">Debit card</label>
<div class="form-check">
<input id="debit" name="paymentMethod" type="radio" class="form-check-input" required>
<label class="form-check-label" for="debit">Debit card</label>
</div>
<div class="custom-control custom-radio">
<input id="paypal" name="paymentMethod" type="radio" class="custom-control-input" required>
<label class="custom-control-label" for="paypal">PayPal</label>
<div class="form-check">
<input id="paypal" name="paymentMethod" type="radio" class="form-check-input" required>
<label class="form-check-label" for="paypal">PayPal</label>
</div>
</div>
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/4.3/extend/icons.md
View file
Expand Up @@ -11,7 +11,7 @@ While most icon sets include multiple file formats, we prefer SVG implementation

## Bootstrap Icons

Bootstrap Icons is a growing library of SVG icons that are designed by [@mdo](https://github.com/mdo) and maintained by [the Bootstrap Team](https://github.com/twbs/members). The beginnings of this icon set come from Bootstrap's very own components—our forms, carousels, and more. Bootstrap has very few icon needs out of the box, so we didn't need much. However, once we got going, we couldn't stop making more.
Bootstrap Icons is a growing library of SVG icons that are designed by [@mdo](https://github.com/mdo) and maintained by [the Bootstrap Team](https://github.com/orgs/twbs/people). The beginnings of this icon set come from Bootstrap's very own components—our forms, carousels, and more. Bootstrap has very few icon needs out of the box, so we didn't need much. However, once we got going, we couldn't stop making more.

Oh, and did we mention they're completely open source? Licensed under MIT, just like Bootstrap, our icon set is available to everyone.

Expand Down

0 comments on commit 4b2a34f

Please sign in to comment.