This repository has been archived by the owner on Jan 13, 2025. It is now read-only.
feat(tab): Add tab indicator #2461
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ language: node_js | |
| branches: | ||
| only: | ||
| - master | ||
| - feat/tabs/tabs | ||
| matrix: | ||
| include: | ||
| - node_js: 8 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,221 @@ | ||
| <!DOCTYPE html> | ||
| <!-- | ||
| 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 | ||
|
|
||
| https://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 | ||
| --> | ||
| <html> | ||
|
There was a problem hiding this comment. Add more cases where the tabs are different widths. And remove the fading bar demo. |
||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title>Tab Indicator - Material Components Catalog</title> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <link rel="icon" type="image/png" href="/images/logo_components_color_2x_web_48dp.png"> | ||
| <link rel="stylesheet" href="/assets/tab-indicator.css"> | ||
| <script src="/ready.js"></script> | ||
| <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mono"> | ||
| <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500"> | ||
| <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> | ||
| </head> | ||
|
|
||
| <body class="mdc-typography"> | ||
| <header class="mdc-toolbar mdc-toolbar--fixed"> | ||
| <div class="mdc-toolbar__row"> | ||
| <section class="mdc-toolbar__section mdc-toolbar__section--align-start"> | ||
| <span class="catalog-back"> | ||
| <a href="/" class="mdc-toolbar__menu-icon"><i class="material-icons"></i></a> | ||
| </span> | ||
| <span class="mdc-toolbar__title catalog-title">Tab Indicator</span> | ||
| </section> | ||
| </div> | ||
| </header> | ||
|
|
||
| <main class="mdc-toolbar-fixed-adjust"> | ||
| <section class="hero"> | ||
| <div class="demo"> | ||
| <div class="demo-item hero-demo-item"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar mdc-tab-indicator--active"></span> | ||
| </div> | ||
| <div class="demo-item demo-item--wide hero-demo-item"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar"></span> | ||
| </div> | ||
| <div class="demo-item demo-item--narrow hero-demo-item"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar"></span> | ||
| </div> | ||
| </div> | ||
| </section> | ||
|
|
||
| <section class="example"> | ||
| <h2>Sliding Bar Indicator</h2> | ||
| <div class="demo"> | ||
| <div class="demo-item"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar mdc-tab-indicator--active demo-indicator custom-sliding-bar"></span> | ||
| </div> | ||
| <div class="demo-item demo-item--narrow"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar custom-sliding-bar"></span> | ||
| </div> | ||
| <div class="demo-item demo-item--wide"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar custom-sliding-bar"></span> | ||
| </div> | ||
| </div> | ||
|
|
||
| <br> | ||
|
|
||
| <h4>Custom Color</h4> | ||
| <div class="demo"> | ||
| <div class="demo-item demo-item--narrow"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar mdc-tab-indicator--active custom-color-bar"></span> | ||
| </div> | ||
| <div class="demo-item"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar custom-color-bar"></span> | ||
| </div> | ||
| <div class="demo-item demo-item--wide"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar custom-color-bar"></span> | ||
| </div> | ||
| </div> | ||
|
|
||
| <br> | ||
|
|
||
| <h4>Custom Height</h4> | ||
| <div class="demo"> | ||
| <div class="demo-item demo-item--narrow"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar mdc-tab-indicator--active custom-height-bar"></span> | ||
| </div> | ||
| <div class="demo-item demo-item--wide"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar custom-height-bar"></span> | ||
| </div> | ||
| <div class="demo-item demo-item"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar custom-height-bar"></span> | ||
| </div> | ||
| </div> | ||
|
|
||
| <br> | ||
|
|
||
| <h4>Custom Border Radius</h4> | ||
| <div class="demo"> | ||
| <div class="demo-item"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar mdc-tab-indicator--active custom-border-radius"></span> | ||
| </div> | ||
| <div class="demo-item demo-item--narrow"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar custom-border-radius"></span> | ||
| </div> | ||
| <div class="demo-item demo-item--wide"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--bar custom-border-radius"></span> | ||
| </div> | ||
| </div> | ||
| </section> | ||
|
|
||
| <section class="example"> | ||
| <h2>Fading Icon Indicator</h2> | ||
| <div class="demo"> | ||
| <div class="demo-item"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--icon mdc-tab-indicator--fade mdc-tab-indicator--active material-icons">favorite</span> | ||
| </div> | ||
| <div class="demo-item demo-item--wide"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--icon mdc-tab-indicator--fade material-icons">star</span> | ||
| </div> | ||
| <div class="demo-item demo-item--narrow"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--icon mdc-tab-indicator--fade material-icons">lens</span> | ||
| </div> | ||
| </div> | ||
|
|
||
| <br> | ||
|
|
||
| <h4>Custom Color</h4> | ||
| <div class="demo"> | ||
| <div class="demo-item demo-item--wide"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--icon mdc-tab-indicator--fade mdc-tab-indicator--active custom-color-icon material-icons">favorite</span> | ||
| </div> | ||
| <div class="demo-item"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--icon mdc-tab-indicator--fade custom-color-icon material-icons">star</span> | ||
| </div> | ||
| <div class="demo-item demo-item--narrow"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--icon mdc-tab-indicator--fade custom-color-icon material-icons">lens</span> | ||
| </div> | ||
| </div> | ||
|
|
||
| <br> | ||
|
|
||
| <h4>Custom Height</h4> | ||
| <div class="demo"> | ||
| <div class="demo-item demo-item--narrow"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--icon mdc-tab-indicator--fade mdc-tab-indicator--active custom-height-icon material-icons">favorite</span> | ||
| </div> | ||
| <div class="demo-item demo-item--wide"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--icon mdc-tab-indicator--fade custom-height-icon material-icons">star</span> | ||
| </div> | ||
| <div class="demo-item"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--icon mdc-tab-indicator--fade custom-height-icon material-icons">lens</span> | ||
| </div> | ||
| </div> | ||
| </section> | ||
|
|
||
| <section class="example"> | ||
| <h2>Mix and Match</h2> | ||
| <p>This demo shows how to use a sliding indicator with custom SVG icon content.</p> | ||
| <div class="demo"> | ||
| <div class="demo-item"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--icon mdc-tab-indicator--active custom-sliding-icon"> | ||
| <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="custom-icon"> | ||
| <path d="M12 7.77L18.39 18H5.61L12 7.77M12 4L2 20h20L12 4z"/> | ||
| <path fill="none" d="M0 0h24v24H0V0z"/> | ||
| </svg> | ||
| </span> | ||
| </div> | ||
| <div class="demo-item demo-item--narrow"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--icon custom-sliding-icon"> | ||
| <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="custom-icon"> | ||
| <path d="M12 7.77L18.39 18H5.61L12 7.77M12 4L2 20h20L12 4z"/> | ||
| <path fill="none" d="M0 0h24v24H0V0z"/> | ||
| </svg> | ||
| </span> | ||
| </div> | ||
| <div class="demo-item demo-item--wide"> | ||
| <span class="mdc-tab-indicator mdc-tab-indicator--icon custom-sliding-icon"> | ||
| <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="custom-icon"> | ||
| <path d="M12 7.77L18.39 18H5.61L12 7.77M12 4L2 20h20L12 4z"/> | ||
| <path fill="none" d="M0 0h24v24H0V0z"/> | ||
| </svg> | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </section> | ||
| </main> | ||
|
|
||
| <script src="/assets/material-components-web.js" async></script> | ||
| <script> | ||
| demoReady(function() { | ||
|
|
||
| function initDemo(demoRoot) { | ||
| var demoItems = demoRoot.querySelectorAll('.demo-item'); | ||
| var activeIndicator; | ||
| [].forEach.call(demoItems, function (demoItem) { | ||
| var indicatorEl = demoItem.querySelector('.mdc-tab-indicator'); | ||
| var indicator = new mdc.tabIndicator.MDCTabIndicator(indicatorEl); | ||
| if (indicatorEl.classList.contains('mdc-tab-indicator--active')) { | ||
| activeIndicator = indicator; | ||
| } | ||
|
|
||
| demoItem.addEventListener('click', function() { | ||
| activeIndicator.deactivate(); | ||
| indicator.activate(activeIndicator.computeClientRect()); | ||
| activeIndicator = indicator; | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| var demos = document.querySelectorAll('.demo'); | ||
| [].forEach.call(demos, initDemo); | ||
| }); | ||
| </script> | ||
| </body> | ||
| </html> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| @import "./common"; | ||
| @import "../packages/mdc-tab-indicator/mixins"; | ||
| @import "../packages/mdc-tab-indicator/mdc-tab-indicator"; | ||
| @import "../packages/mdc-elevation/mixins"; | ||
| @import "../packages/mdc-theme/color-palette"; | ||
|
|
||
| .hero { | ||
| flex-direction: column; | ||
| } | ||
|
|
||
| .demo { | ||
| @include mdc-elevation(1); | ||
|
|
||
| display: flex; | ||
| width: 400px; | ||
| height: 50px; | ||
| margin: 2rem 0; | ||
| } | ||
|
|
||
| .demo-item { | ||
| @include mdc-tab-indicator-surface; | ||
|
There was a problem hiding this comment. so will this |
||
|
|
||
| flex: 2 0 auto; | ||
| height: inherit; | ||
| background-color: $material-color-grey-50; | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| .demo-item--narrow { | ||
| flex: 1 0 auto; | ||
| } | ||
|
|
||
| .demo-item--wide { | ||
| flex: 3 0 auto; | ||
| } | ||
|
|
||
| .demo-item:hover { | ||
| background-color: white; | ||
| } | ||
|
|
||
| .demo > .demo-item:nth-child(n + 2) { | ||
| border-left: 1px solid $material-color-grey-300; | ||
| } | ||
|
|
||
| .demo-label { | ||
| position: relative; | ||
| z-index: 2; | ||
| } | ||
|
|
||
| .custom-color-bar { | ||
| @include mdc-tab-indicator-bar-color($material-color-orange-a400); | ||
| } | ||
|
|
||
| .custom-color-icon { | ||
| @include mdc-tab-indicator-icon-color($material-color-orange-a400); | ||
| } | ||
|
|
||
| .custom-height-bar { | ||
| @include mdc-tab-indicator-bar-height(8px); | ||
| } | ||
|
|
||
| .custom-height-icon { | ||
| @include mdc-tab-indicator-icon-height(44px); | ||
| } | ||
|
|
||
| .custom-border-radius { | ||
| @include mdc-tab-indicator-bar-height(5px); | ||
| @include mdc-tab-indicator-bar-top-corner-radius(5px); | ||
| } | ||
|
|
||
| .custom-fading-bar { | ||
| @include mdc-tab-indicator-bar-height(4px); | ||
| @include mdc-tab-indicator-bar-color($material-color-green-a400); | ||
| @include mdc-tab-indicator-bar-top-corner-radius(4px); | ||
| } | ||
|
|
||
| .custom-sliding-icon { | ||
| @include mdc-tab-indicator-icon-height(30px); | ||
| @include mdc-tab-indicator-icon-color($material-color-pink-a400); | ||
| } | ||
|
|
||
| .custom-icon { | ||
| height: inherit; | ||
| fill: currentColor; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This demo page needs some restructure
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated