Skip to content

Commit

Permalink
List checkbox and radio
Browse files Browse the repository at this point in the history
  • Loading branch information
djibe committed May 11, 2020
1 parent f8cdc00 commit c36f169
Show file tree
Hide file tree
Showing 12 changed files with 74 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 4.4.1 - beta 3

* **New** one-line and two-line lists (see Material > Lists documentation)
* Improved documentation

## 4.4.1 - beta 2

Expand Down
8 changes: 5 additions & 3 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
<script crossorigin="anonymous" integrity="{{ site.cdn.bs_js_hash }}" src="{{ site.cdn.bs_js }}"></script>

<!-- Add Material JavaScript on top of Bootstrap JavaScript -->
<script src="{{ site.baseurl }}/js/material.min.js"></script>
<script src="{{ site.baseurl }}/js/material.min.js" async></script>

<!-- Additional JavaScript for documentation site -->
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/cdn/docsearch.min.js" integrity="sha256-qybEsgf0PGiQS22AmoozPs09oRnSC7Gu7eBu4fbS2Ac=" crossorigin="anonymous"></script>
<script src="{{ site.baseurl }}/docs/js/docs.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/cdn/docsearch.min.js" integrity="sha256-qybEsgf0PGiQS22AmoozPs09oRnSC7Gu7eBu4fbS2Ac=" crossorigin="anonymous" async></script>
<script src="{{ site.baseurl }}/docs/js/docs.min.js" async></script>
<script src="//instant.page/3.0.0" type="module"
integrity="sha384-OeDn4XE77tdHo8pGtE1apMPmAipjoxUQ++eeJa6EtJCfHlvijigWiJpD7VDPWXV1"></script>
2 changes: 1 addition & 1 deletion _layouts/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<head>
{% include header.html %}
</head>
<body class="doc-body">
<body class="doc-body" data-instant-intensity="mousedown">
{% include skip.html %}

{{ content }}
Expand Down
28 changes: 28 additions & 0 deletions assets/scss/material/_expansion-panel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,34 @@
.list-group-shaped & {
border-radius: 0 2rem 2rem 0;
}

// List checkbox and radio
.custom-control {
display: flex;
padding-left: 0;
width: 100%;
}

.custom-control-label {
flex-grow: 1;
font-size: inherit;
letter-spacing: inherit;
line-height: $expansion-panel-height;
}

.custom-control-label::before {
line-height: $expansion-panel-height;
margin-top: 0;
right: 0;
left: auto;
}

.custom-control-label::after {
line-height: $expansion-panel-height !important; // stylelint-disable-line declaration-no-important
padding: 0 0.6875rem;
right: 0;
left: auto;
}
}

// Material Two-line lists
Expand Down
1 change: 0 additions & 1 deletion assets/scss/material/_menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
font-size: $menu-font-size;
list-style: none;
//max-height: calc(100vh - 32px);
max-width: 100%;
min-width: $menu-min-width;
padding: $menu-padding-y 0;
position: absolute;
Expand Down
32 changes: 31 additions & 1 deletion css/material.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/material.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/material.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/material.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/4.4/material/lists.md
Original file line number Diff line number Diff line change
Expand Up @@ -365,4 +365,4 @@ To insert a separator in your lists, simply add this element `<li class="list-gr
</ul>

{% endcapture %}
{% include example.html content=example %}
{% include example.html content=example %}
3 changes: 2 additions & 1 deletion docs/4.4/material/snackbars.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ Snackbars inform users of a process that an app has performed or will perform. T
Material Components for the web: Snackbar</a>
</div>

Daemonite is compatible with default Bootstrap's toast HTML markup.
**Daemonite is using default Bootstrap's toast HTML markup without extra CSS**.
Here are just a few demos to show how to use it best.

## Live demo

Expand Down
4 changes: 2 additions & 2 deletions docs/4.4/material/steppers.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ group: material
toc: true
---

**Steppers are no longer cited in Material guidelines. The links refer to the archived version of Material design.**
**Steppers are no longer cited in Material guidelines. The link refers to the archived version of Material design.**

<div class="list-group mt-lg-5">
<a href="https://material.io/archive/guidelines/components/steppers.html" target="_blank" class="list-group-item list-group-item-action d-flex font-weight-bold">
<a href="https://material.io/archive/guidelines/components/steppers.html" target="_blank" class="list-group-item list-group-item-action d-flex font-weight-bold">
<span class="list-group-item-icon lgi-icon-md"></span>
Material Design: Steppers</a>
</div>
Expand Down

0 comments on commit c36f169

Please sign in to comment.