diff --git a/demos/index.html b/demos/index.html index 9e9dc199dd9..2439d39af40 100644 --- a/demos/index.html +++ b/demos/index.html @@ -164,14 +164,6 @@ - - - - Select - Popover selection menus - - - diff --git a/demos/select.html b/demos/select.html deleted file mode 100644 index 9c3a013e741..00000000000 --- a/demos/select.html +++ /dev/null @@ -1,334 +0,0 @@ - - - - - - Select Menu - Material Components Catalog - - - - - - - - - - -
-
-
- - Select -
-
-
- -
-
-
-
- - -
-
-
- -
-

Fully-Featured JS Component

-
-
- - -
-
-
-

Currently selected: (none)

-
- - -
-
- - -
-
- - -
-
- -
-
- -
-
- -
-

Outlined Select

-
-
- - -
- - - -
-
-
-
-

Currently selected: (none)

-
- - -
-
- - -
-
- - -
-
- -
-
- -
-
- -
-

Pre-selected option via HTML

-
-
- - -
-
-
-
-
-

MDC Select with optgroups

-
- - -
-
-
-
- - - - - diff --git a/demos/select.scss b/demos/select.scss deleted file mode 100644 index e9cba37de77..00000000000 --- a/demos/select.scss +++ /dev/null @@ -1,54 +0,0 @@ -// -// Copyright 2017 Google Inc. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// - -@import "./common"; -@import "../packages/mdc-button/mdc-button"; -@import "../packages/mdc-select/mdc-select"; - -// stylelint-disable selector-class-pattern -.demo-select-custom-colors { - @include mdc-select-ink-color(blue); - @include mdc-select-label-color(rgba(blue, .6)); - @include mdc-select-bottom-line-color(rgba(blue, .5)); - - // Focused colors - @include mdc-select-focused-bottom-line-color(green); - @include mdc-select-focused-label-color(green); - - // Hover colors - @include mdc-select-hover-bottom-line-color(rgba(blue, .87)); -} - -.demo-select-custom-colors.mdc-select--box { - @include mdc-select-container-fill-color(rgba(blue, .1)); -} - -.demo-select-custom-colors.mdc-select--outlined { - @include mdc-select-outline-color(rgba(blue, .6)); - @include mdc-select-hover-outline-color(rgba(blue, .87)); - @include mdc-select-focused-outline-color(green); -} - -.button-container { - margin: 8px 0; -} -// stylelint-enable selector-class-pattern diff --git a/packages/mdc-menu/mdc-menu.scss b/packages/mdc-menu/mdc-menu.scss index ec37f8e9b2b..d31f96d8633 100644 --- a/packages/mdc-menu/mdc-menu.scss +++ b/packages/mdc-menu/mdc-menu.scss @@ -46,7 +46,7 @@ .mdc-list-item--disabled { cursor: auto; } - + //stylelint-disable selector-max-type, selector-no-qualifying-type a.mdc-list-item .mdc-list-item__text, a.mdc-list-item .mdc-list-item__graphic { diff --git a/packages/mdc-notched-outline/_functions.scss b/packages/mdc-notched-outline/_functions.scss index 34e298b05e2..8c56af470ab 100644 --- a/packages/mdc-notched-outline/_functions.scss +++ b/packages/mdc-notched-outline/_functions.scss @@ -31,5 +31,6 @@ // @function mdc-notched-outline-get-notch-padded-position($cornerSize) { $leadingStrokeLength: max(0, $mdc-notched-outline-min-leading-stroke-edge-position - $cornerSize - 1.2); + @return $cornerSize + $leadingStrokeLength + $mdc-notched-outline-notch-gutter-size + 1.2; } diff --git a/packages/mdc-select/README.md b/packages/mdc-select/README.md index 7a4221f85b6..b6c3e9b753f 100644 --- a/packages/mdc-select/README.md +++ b/packages/mdc-select/README.md @@ -6,12 +6,6 @@ iconId: menu path: /catalog/input-controls/select-menus/ --> -## Important - Default Style Deprecation Notice - -The existing default select style will be changed in an upcoming release. The Material spec indicates that -the default style will be the filled variant (currently referred to as the box variant). This will become the -default style. Continuing to add the `mdc-select--box` class to the select will result in no change. - # Select Menus -MDC Select provides Material Design single-option select menus. It functions as a wrapper around the -browser's native `` +element, or a MDC Menu. It is fully accessible, and fully RTL-aware. ## Design & API Documentation @@ -43,10 +37,14 @@ npm install @material/select ## Basic Usage +This section documents how to use a MDC Select with a native `