Skip to content

Commit 67e0684

Browse files
committed
add scroll demo to tooltip
1 parent 389dbd4 commit 67e0684

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

src/demo-app/tooltip/tooltip-demo.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<h1>Tooltip Demo</h1>
33

44
<p class="centered" style="height: 200px; overflow: auto;" cdk-scrollable>
5-
<button #tooltip="mdTooltip" style="margin: 300px;"
5+
<button #tooltip="mdTooltip" style="margin-bottom: 300px;"
66
md-raised-button
77
color="primary"
88
[mdTooltip]="message"
@@ -11,6 +11,7 @@ <h1>Tooltip Demo</h1>
1111
[mdTooltipHideDelay]="hideDelay">
1212
Mouse over to see the tooltip
1313
</button>
14+
Scroll down while tooltip is open to see it hide automatically
1415
</p>
1516

1617
<p>

src/demo-app/tooltip/tooltip-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ export class TooltipDemo {
1212
position: TooltipPosition = 'below';
1313
message: string = 'Here is the tooltip';
1414
showDelay = 0;
15-
hideDelay = 0;
15+
hideDelay = 1000;
1616
}

src/lib/sidenav/sidenav.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,7 @@ import {FocusTrap} from '../core/a11y/focus-trap';
2222
import {ESCAPE} from '../core/keyboard/keycodes';
2323
import {OverlayModule} from '../core/overlay/overlay-directives';
2424
import {InteractivityChecker} from '../core/a11y/interactivity-checker';
25-
<<<<<<< ebeb579c60bb44de259764cd9d226ea92252671e
26-
<<<<<<< 38f2302c080b3941ee7be5289c9a47a0d1a3bcef
2725
import {ScrollDispatcher} from '../core/overlay/scroll/scroll-dispatcher';
28-
=======
29-
import {MdLiveAnnouncer} from '../core/a11y/live-announcer';
30-
<<<<<<< 7f62f0a674630555a66a123367e701089f68e338
31-
import {ScrollDispatcher} from '../core/scroll/scroll-dispatcher';
32-
>>>>>>> review response
33-
=======
34-
=======
35-
>>>>>>> make lint happy
36-
import {ScrollDispatcher} from '../core/overlay/scroll/scroll-dispatcher';
37-
>>>>>>> move scroll to overlay
3826

3927

4028
/** Exception thrown when two MdSidenav are matching the same side. */

0 commit comments

Comments
 (0)