Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit f0ff94d

Browse files
authored
fix(toolbar): Improve layout and scrolling logic of items in toolbars (#764)
1 parent 184fdc2 commit f0ff94d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+236
-248
lines changed

demos/button.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<div class="mdc-toolbar__row">
5858
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
5959
<span class="catalog-back">
60-
<a href="/"><i class="material-icons">&#xE5C4;</i></a>
60+
<a href="/" class="mdc-toolbar__icon--menu"><i class="material-icons">&#xE5C4;</i></a>
6161
</span>
6262
<span class="mdc-toolbar__title catalog-title">Buttons</span>
6363
</section>

demos/card.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<div class="mdc-toolbar__row">
124124
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
125125
<span class="catalog-back">
126-
<a href="/"><i class="material-icons">&#xE5C4;</i></a>
126+
<a href="/" class="mdc-toolbar__icon--menu"><i class="material-icons">&#xE5C4;</i></a>
127127
</span>
128128
<span class="mdc-toolbar__title catalog-title">Card</span>
129129
</section>

demos/checkbox.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<div class="mdc-toolbar__row">
6262
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
6363
<span class="catalog-back">
64-
<a href="/"><i class="material-icons">&#xE5C4;</i></a>
64+
<a href="/" class="mdc-toolbar__icon--menu"><i class="material-icons">&#xE5C4;</i></a>
6565
</span>
6666
<span class="mdc-toolbar__title catalog-title">Checkbox</span>
6767
</section>

demos/demos.css

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,6 @@ fieldset {
3434
border: 0;
3535
}
3636

37-
.mdc-toolbar a, .mdc-toolbar a:visited {
38-
text-decoration: none;
39-
color: #f0f0f0;
40-
}
41-
42-
.catalog-title {
43-
font-family: "Roboto Mono", monospace;
44-
}
45-
46-
.catalog-logo, .catalog-back {
47-
text-decoration: none;
48-
padding-right: 24px;
49-
color: #eeeeee;
50-
}
51-
5237
.hero {
5338
background-color: rgba(0, 0, 0, 0.05);
5439
min-height: 360px;

demos/dialog.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<div class="mdc-toolbar__row">
5151
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
5252
<span class="catalog-back">
53-
<a href="/"><i class="material-icons">&#xE5C4;</i></a>
53+
<a href="/" class="mdc-toolbar__icon--menu"><i class="material-icons">&#xE5C4;</i></a>
5454
</span>
5555
<span class="mdc-toolbar__title catalog-title">Dialog</span>
5656
</section>

demos/drawer/permanent-drawer-above-toolbar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<div class="mdc-toolbar__row">
113113
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
114114
<span class="catalog-back">
115-
<a href="/"><i class="material-icons">&#xE5C4;</i></a>
115+
<a href="/" class="mdc-toolbar__icon--menu"><i class="material-icons">&#xE5C4;</i></a>
116116
</span>
117117
<span class="mdc-toolbar__title catalog-title">Permanent Drawer Above Toolbar</span>
118118
</section>

demos/drawer/permanent-drawer-below-toolbar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<div class="mdc-toolbar__row">
7171
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
7272
<span class="catalog-back">
73-
<a href="/"><i class="material-icons">&#xE5C4;</i></a>
73+
<a href="/" class="mdc-toolbar__icon--menu"><i class="material-icons">&#xE5C4;</i></a>
7474
</span>
7575
<span class="mdc-toolbar__title catalog-title">Permanent Drawer Below Toolbar</span>
7676
</section>

demos/drawer/persistent-drawer.html

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,6 @@
4141
width: 100%;
4242
}
4343

44-
/* A simple menu button. */
45-
.demo-menu {
46-
background: none;
47-
border: none;
48-
width: 24px;
49-
height: 24px;
50-
padding: 0;
51-
margin: 0;
52-
margin-right: 24px;
53-
color: #FFF;
54-
box-sizing: border-box;
55-
}
56-
5744
/* Stack toolbar and main on top of each other. */
5845
.demo-content {
5946
display: inline-flex;
@@ -108,7 +95,7 @@
10895
<header class="mdc-toolbar mdc-elevation--z4">
10996
<div class="mdc-toolbar__row">
11097
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
111-
<button class="demo-menu material-icons">menu</button>
98+
<button class="demo-menu material-icons mdc-toolbar__icon--menu">menu</button>
11299
<span class="mdc-toolbar__title catalog-title">Persistent Drawer</span>
113100
</section>
114101
</div>

demos/drawer/temporary-drawer.html

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,6 @@
3131
box-sizing: border-box;
3232
}
3333

34-
/* A simple menu button. */
35-
.demo-menu {
36-
background: none;
37-
border: none;
38-
width: 24px;
39-
height: 24px;
40-
padding: 0;
41-
margin: 0;
42-
margin-right: 24px;
43-
color: #FFF;
44-
box-sizing: border-box;
45-
}
46-
4734
.demo-main {
4835
padding-left: 16px;
4936
overflow: auto;
@@ -54,7 +41,7 @@
5441
<div class="mdc-toolbar mdc-toolbar--fixed">
5542
<div class="mdc-toolbar__row">
5643
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
57-
<button class="demo-menu material-icons">menu</button>
44+
<button class="demo-menu material-icons mdc-toolbar__icon--menu">menu</button>
5845
<span class="mdc-toolbar__title catalog-title">Temporary Drawer</span>
5946
</section>
6047
</div>

demos/elevation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<div class="mdc-toolbar__row">
7171
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
7272
<span class="catalog-back">
73-
<a href="/"><i class="material-icons">&#xE5C4;</i></a>
73+
<a href="/" class="mdc-toolbar__icon--menu"><i class="material-icons">&#xE5C4;</i></a>
7474
</span>
7575
<span class="mdc-toolbar__title catalog-title">Elevation</span>
7676
</section>

0 commit comments

Comments
 (0)