diff --git a/docs/assets/js/src/index.js b/docs/assets/js/src/index.js
index 23373e2e..bb902b73 100644
--- a/docs/assets/js/src/index.js
+++ b/docs/assets/js/src/index.js
@@ -27,7 +27,7 @@ class Application {
$('.bd-example-indeterminate [type="checkbox"]').prop('indeterminate', true)
// Disable empty links in docs examples
- $('.bd-example [href=#]').click((e) => {
+ $('.bd-example [href="#"]').click((e) => {
e.preventDefault()
})
diff --git a/docs/examples/dashboard/example.scss b/docs/examples/dashboard/example.scss
index ab41c1f6..2c37aec3 100644
--- a/docs/examples/dashboard/example.scss
+++ b/docs/examples/dashboard/example.scss
@@ -39,10 +39,11 @@ a, a:hover {
}
.mdb-layout-drawer {
- background-color: $blue-grey-900;
+ background-color: $blue-grey-800;
color: $blue-grey-50;
> header {
+ background-color: $blue-grey-900;
height: 151px;
.avatar {
@@ -73,8 +74,7 @@ a, a:hover {
}
> .list-group {
- background-color: $blue-grey-800;
- z-index: -2;
+ //z-index: -2;
.list-group-item {
color: rgba(255, 255, 255, 0.56);
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index 9d0836ee..ce15e411 100644
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -91,7 +91,7 @@ js: example.js
-
+
homeHome
diff --git a/docs/examples/drawer/index.html b/docs/examples/drawer/index.html
index f811e8a4..8fc38627 100644
--- a/docs/examples/drawer/index.html
+++ b/docs/examples/drawer/index.html
@@ -45,7 +45,7 @@ group: material-design
-
+
homeHome
@@ -67,7 +67,7 @@ group: material-design
Responsive drawer template
-
This template provides a push style drawer for large screens, but an overlay style drawer for smaller screens.
+
This template provides a push style drawer for large screens, but an overlay style drawer for smaller screens. For example, try viewing on an iPad in portrait vs. landscape.
diff --git a/docs/material-design/drawers.md b/docs/material-design/drawers.md
index 94305e2b..74e2e0f0 100644
--- a/docs/material-design/drawers.md
+++ b/docs/material-design/drawers.md
@@ -20,6 +20,10 @@ The following examples provide a good starting point:
- [Drawer template]({{ site.baseurl }}/examples/dashboard/) is a basic fully responsive template.
- [Dashboard example]({{ site.baseurl }}/examples/dashboard/) is a comprehensive fully responsive demonstration.
+### Behavior
+
+The default behavior for any drawer is to be _out_ of the frame of view. It can be set _in_ the frame of view either by using using one or the gridpoint responsive classes such as `mdb-drawer-in-lg-up`, or by using `mdb-drawer-in`. Any drawer, be it responsive or statically set to _in_ can be _forced_ out by using `mdb-drawer-out`.
+
### Markup
In order to use the drawer component, MDB has created the following flex based layout structure:
@@ -32,6 +36,74 @@ In order to use the drawer component, MDB has created the following flex based l
{% endhighlight %}
+## Styles
+
+### Push
+
+The default behavior is for content to be pushed.
+{% example html id=drawer-s1 %}
+
+{% endexample %}
+
+### Overlay
+Optional behavior will overlay the drawer and provide a backdrop:
+{% example html id=drawer-s2 %}
+
+{% endexample %}
## Positions
@@ -101,7 +173,7 @@ The following positioning marker classes should be placed on the `mdb-layout-con
-
+
Link 1
Link 2
Link 3
@@ -134,7 +206,7 @@ The following positioning marker classes should be placed on the `mdb-layout-con
-
+
Link 1
Link 2
Link 3
@@ -167,7 +239,7 @@ The following positioning marker classes should be placed on the `mdb-layout-con
-
+
Link 1
Link 2
Link 3
@@ -200,7 +272,7 @@ The following positioning marker classes should be placed on the `mdb-layout-con
-
+
Link 1
Link 2
Link 3
@@ -214,76 +286,6 @@ The following positioning marker classes should be placed on the `mdb-layout-con
{% endexample %}
-## Styles
-
-### Push
-
-The default behavior is for content to be pushed.
-{% example html id=drawer-s1 %}
-
-{% endexample %}
-
-### Overlay
-Optional behavior will overlay the drawer and provide a backdrop:
-{% example html id=drawer-s2 %}
-
-{% endexample %}
-
-
## Responsiveness vs Static
### Static
diff --git a/scss/.scss-lint.yml b/scss/.scss-lint.yml
index f64c3e0e..d62f40c0 100644
--- a/scss/.scss-lint.yml
+++ b/scss/.scss-lint.yml
@@ -122,6 +122,7 @@ linters:
"flex-pack",
"flex-align",
"flex-shrink",
+ "flex-grow",
"align-items",
"align-self",
"justify-content",
diff --git a/scss/_drawer.scss b/scss/_drawer.scss
index 4482977b..a96d16e1 100644
--- a/scss/_drawer.scss
+++ b/scss/_drawer.scss
@@ -30,7 +30,6 @@
// Placement of common components within the drawer
// You might say this is opinionated - feedback welcome.
> header {
- box-sizing: border-box;
display: flex;
flex-direction: column;
justify-content: flex-end;
@@ -43,11 +42,7 @@
}
> .list-group {
- flex-direction: column;
- align-items: stretch;
padding-top: 1rem;
- flex-grow: 1;
- //z-index: -2;
.list-group-item {
padding-right: 2.5rem;
diff --git a/scss/_layout.scss b/scss/_layout.scss
index 68f6fb7a..24d25829 100644
--- a/scss/_layout.scss
+++ b/scss/_layout.scss
@@ -43,9 +43,9 @@
z-index: 1; // under a header
display: inline-block;
//-ms-flex: 0 1 auto; // Fix IE10 bug.
+ flex-grow: 1;
overflow-x: hidden;
overflow-y: auto; // mobile webkit smooth scrolling may need scroll, but auto seems to be working and omits the scroll border
- flex-grow: 1;
-webkit-overflow-scrolling: touch; // mobile webkit smooth scrolling
@include material-animation-default();
}
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index dca2cbae..96cd2825 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -6,6 +6,8 @@
// - triple line 88dp
.list-group {
+ flex-grow: 1;
+
// Add 8dp of padding at the top and bottom of a list. One exception is at the top of a list with a subheader, because subheaders contain their own padding.
padding: .5rem 0;