Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #34149 from luke-chang/1254040_tv_remove_filter_sh…
Browse files Browse the repository at this point in the history
…rinking

Bug 1254040 - [TV][Home] Remove expanding/shrinking motion for filters, r=rexboy
  • Loading branch information
luke-chang committed Mar 14, 2016
2 parents 0ca84e6 + c914e81 commit c5e316e
Show file tree
Hide file tree
Showing 11 changed files with 100 additions and 435 deletions.
1 change: 0 additions & 1 deletion tv_apps/smart-home/bower.json
Expand Up @@ -16,7 +16,6 @@
"dependencies": {
"evt": "fxos-components/evt#~0.4.0",
"smart-button": "fxos-components/smart-button#~0.0.2",
"menu-group": "fxos-components/menu-group",
"smart-icons": "smart-components/smart-icons#~0.0.2",
"smart-bubbles": "smart-components/smart-bubbles",
"smart-dialog": "smart-components/smart-dialog",
Expand Down
29 changes: 0 additions & 29 deletions tv_apps/smart-home/bower_components/menu-group/.bower.json

This file was deleted.

21 changes: 0 additions & 21 deletions tv_apps/smart-home/bower_components/menu-group/bower.json

This file was deleted.

128 changes: 0 additions & 128 deletions tv_apps/smart-home/bower_components/menu-group/script.js

This file was deleted.

136 changes: 0 additions & 136 deletions tv_apps/smart-home/bower_components/menu-group/style.css

This file was deleted.

7 changes: 2 additions & 5 deletions tv_apps/smart-home/index.html
Expand Up @@ -11,7 +11,6 @@
<link rel="stylesheet" type="text/css" href="bower_components/smart-dialog/style.css">
<link rel="stylesheet" type="text/css" href="bower_components/smart-bubbles/style.css">
<link rel="stylesheet" type="text/css" href="bower_components/smart-modal-dialog/style.css">
<link rel="stylesheet" type="text/css" href="bower_components/menu-group/style.css">
<link rel="stylesheet" type="text/css" href="shared/style/smart-screen/animations.css">

<!-- home -->
Expand Down Expand Up @@ -57,8 +56,6 @@
<script defer src="bower_components/smart-dialog/script.js"></script>
<script defer src="bower_components/smart-bubbles/script.js"></script>
<script defer src="bower_components/smart-modal-dialog/script.js"></script>
<!-- menu group depends on evt, it should be added after evt.js -->
<script defer src="bower_components/menu-group/script.js"></script>

<!-- Shared TV library for keyboard-based navigating -->
<script defer src="shared/js/smart-screen/scrollable.js"></script>
Expand Down Expand Up @@ -141,7 +138,7 @@
</div>
</section>
<section id="filter-tab-container" class="filter-tab-container">
<menu-group data-icon="filter" id="filter-tab-group" class="filter-tab-group">
<div data-icon="filter" id="filter-tab-group" class="filter-tab-group">
<smart-button type="simple-text" id="filter-all-button" data-icon-type="filter">
<span data-l10n-id="all"></span>
</smart-button>
Expand All @@ -157,7 +154,7 @@
<smart-button type="simple-text" id="filter-website-button" data-icon-type="web">
<span data-l10n-id="website"></span>
</smart-button>
</menu-group>
</div>
</section>
<section id="search-bar" class="search-bar hidden">
<smart-button data-icon="mic" class="search-mic-button fade-out"></smart-button>
Expand Down

0 comments on commit c5e316e

Please sign in to comment.