Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

Commit

Permalink
Revert "refactor(list): simplify list component scss" (#10221)
Browse files Browse the repository at this point in the history
  • Loading branch information
kara authored Jan 4, 2017
1 parent 4417564 commit 16c2512
Show file tree
Hide file tree
Showing 7 changed files with 528 additions and 546 deletions.
8 changes: 4 additions & 4 deletions src/components/list/demoBasicUsage/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ <h3>{{ todos[1].who }}</h3>
</md-list-item>
<md-divider ></md-divider>
<md-subheader class="md-no-sticky">Classes</md-subheader>
<md-list-item class="md-2-line" ng-repeat="phone in phones" ng-class="{'md-offset': phone.options.offset }">
<md-list-item class="md-2-line" ng-repeat="phone in phones">
<md-icon md-svg-icon="{{phone.options.icon}}" ng-if="phone.options.icon" ng-class="{'md-avatar-icon': phone.options.avatarIcon}"></md-icon>
<img ng-src="{{phone.options.face}}?25" class="md-avatar" alt="{{phone.options.face}}"
ng-if="phone.options.face"/>
<div class="md-list-item-text">
<div class="md-list-item-text" ng-class="{'md-offset': phone.options.offset }">
<h3> {{ phone.number }} </h3>
<p> {{ phone.type }} </p>
</div>
Expand Down Expand Up @@ -127,11 +127,11 @@ <h3>{{ todos[1].who }}</h3>
</md-list-item>
<md-divider ></md-divider>
<md-subheader class="md-no-sticky">Classes</md-subheader>
<md-list-item class="md-2-line" ng-repeat="phone in phones" ng-class="{'md-offset': phone.options.offset }">
<md-list-item class="md-2-line" ng-repeat="phone in phones">
<md-icon md-svg-icon="{{phone.options.icon}}" ng-if="phone.options.icon" ng-class="{'md-avatar-icon': phone.options.avatarIcon}"></md-icon>
<img ng-src="{{phone.options.face}}?25" class="md-avatar" alt="{{phone.options.face}}"
ng-if="phone.options.face"/>
<div class="md-list-item-text">
<div class="md-list-item-text" ng-class="{'md-offset': phone.options.offset }">
<h3> {{ phone.number }} </h3>
<p> {{ phone.type }} </p>
</div>
Expand Down
21 changes: 11 additions & 10 deletions src/components/list/demoListControls/style.css
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
md-divider {
margin-top: 0;
margin-bottom: 0;
margin-top: 0;
margin-bottom: 0;
}

md-list {
padding-top: 0;
padding-top:0;
}

md-list-item.md-list-item-content > p,
md-list-item .md-list-item-content > p {
-webkit-user-select: none; /* Chrome all / Safari all */
-moz-user-select: none; /* Firefox all */
-ms-user-select: none; /* IE 10+ */
user-select: none; /* Likely future */
md-list-item > p,
md-list-item > .md-list-item-inner > p,
md-list-item .md-list-item-inner > p,
md-list-item .md-list-item-inner > .md-list-item-inner > p {
-webkit-user-select: none; /* Chrome all / Safari all */
-moz-user-select: none; /* Firefox all */
-ms-user-select: none; /* IE 10+ */
user-select: none; /* Likely future */
}
317 changes: 0 additions & 317 deletions src/components/list/list-base.scss

This file was deleted.

Loading

0 comments on commit 16c2512

Please sign in to comment.