Skip to content

Commit

Permalink
Merge branch 'master' into feat/tab-indicator-events
Browse files Browse the repository at this point in the history
  • Loading branch information
kfranqueiro committed Aug 14, 2018
2 parents d641cea + 1245573 commit e17a889
Show file tree
Hide file tree
Showing 110 changed files with 5,561 additions and 3,374 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
<a name="0.38.1"></a>
## [0.38.1](https://github.com/material-components/material-components-web/compare/v0.38.0...v0.38.1) (2018-08-13)


### Bug Fixes

* **dialog:** Fixes transitionend event not always being called ([#3267](https://github.com/material-components/material-components-web/issues/3267)) ([f4af684](https://github.com/material-components/material-components-web/commit/f4af684))
* **list:** Update clickable elements selector ([#3312](https://github.com/material-components/material-components-web/issues/3312)) ([c4fc932](https://github.com/material-components/material-components-web/commit/c4fc932))
* **radio:** Add missing `[@import](https://github.com/import)` for theme mixins; add screenshot tests ([#3285](https://github.com/material-components/material-components-web/issues/3285)) ([553438a](https://github.com/material-components/material-components-web/commit/553438a))
* **ripple:** Register focus/blur handlers in IE ([#3294](https://github.com/material-components/material-components-web/issues/3294)) ([1e10ac2](https://github.com/material-components/material-components-web/commit/1e10ac2))
* **select:** add adapter ([#3233](https://github.com/material-components/material-components-web/issues/3233)) ([3b20de8](https://github.com/material-components/material-components-web/commit/3b20de8))
* **text-field:** Set the margin for text-area helper text ([#3290](https://github.com/material-components/material-components-web/issues/3290)) ([e395bb3](https://github.com/material-components/material-components-web/commit/e395bb3))
* **text-field:** Stop emitting unused CSS in Text Field & Select ([#3293](https://github.com/material-components/material-components-web/issues/3293)) ([4041d9e](https://github.com/material-components/material-components-web/commit/4041d9e))



<a name="0.38.0"></a>
# [0.38.0](https://github.com/material-components/material-components-web/compare/v0.37.1...v0.38.0) (2018-07-30)

Expand Down
9 changes: 9 additions & 0 deletions demos/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,15 @@
</span>
</a>


<a href="menu-surface.html" role="listitem" class="mdc-list-item">
<span class="demo-catalog-list-icon mdc-list-item__graphic"><img src="/images/ic_menu_24px.svg" /></span>
<span class="mdc-list-item__text">
Menu Surface
<span class="mdc-list-item__secondary-text">Pop over menu surfaces</span>
</span>
</a>

<a href="radio.html" role="listitem" class="mdc-list-item">
<span class="demo-catalog-list-icon mdc-list-item__graphic"><img src="/images/ic_radio_button_24px.svg" /></span>
<span class="mdc-list-item__text">
Expand Down
374 changes: 374 additions & 0 deletions demos/menu-surface.html

Large diffs are not rendered by default.

86 changes: 86 additions & 0 deletions demos/menu-surface.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
//
// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

@import "./common";
@import "../packages/mdc-button/mdc-button";
@import "../packages/mdc-icon-button/mdc-icon-button";
@import "../packages/mdc-list/mdc-list";
@import "../packages/mdc-menu-surface/mdc-menu-surface";
@import "../packages/mdc-image-list/mdc-image-list";

body {
position: relative;
}

.hero .mdc-menu-surface {
position: static; // Required for proper IE11 alignment.
z-index: auto;
}

.demo-content {
position: relative;
top: 64px;
}

.demo-controls-container {
width: 100%;
height: calc(100vh - 80px);
}

.demo-controls {
width: 500px;
margin-right: auto;
margin-left: auto;
}

.mdc-menu-surface--anchor {
position: absolute;
margin: 16px;
}

.margin-inputs input {
width: 2em;
}

.left-column-controls {
display: inline-block;
vertical-align: top;
}

.right-column-controls {
display: inline-block;
margin-left: 2em;
vertical-align: top;
}

.demo-button__normal-text,
.demo-button__long-text {
display: none;
}

.demo-button--normal .demo-button__normal-text,
.demo-button--long .demo-button__normal-text,
.demo-button--long .demo-button__long-text {
display: inline;
}

.standard-image-list {
@include mdc-image-list-aspect(1.5); // Images are 3:2
@include mdc-image-list-standard-columns(1);

width: 200px;
}

Loading

0 comments on commit e17a889

Please sign in to comment.