Permalink
Browse files

feature: Merged latest MDL/JS master

  • Loading branch information...
MikeMitterer committed Feb 15, 2016
1 parent 5eeff21 commit 018bf127d5096e3b177b1577d106ab7bf319777d
@@ -83,7 +83,7 @@
line-height: $card-supporting-text-line-height;
overflow: hidden;
padding: $card-vertical-padding $card-horizontal-padding;
width: 90%;
box-sizing: border-box;
}
.mdl-card__actions {
@@ -88,19 +88,24 @@
padding-bottom: 8px;
box-sizing: border-box;
.mdl-data-table__header--sorted-ascending, .mdl-data-table__header--sorted-descending {
&.mdl-data-table__header--sorted-ascending,
&.mdl-data-table__header--sorted-descending {
color: $data-table-header-sorted-color;
&:before {
font-size: $data-table-header-sort-icon-size;
@include typo-icon;
font-size: $data-table-header-sort-icon-size;
content: "\e5d8";
margin-right: 5px;
vertical-align: sub;
}
&:hover {
cursor: pointer;
&:before {
color: $data-table-header-sorted-icon-hover-color;
}
}
}
.mdl-data-table__header--sorted-ascending:before {
content: "\e5d8";
}
.mdl-data-table__header--sorted-descending:before {
&.mdl-data-table__header--sorted-descending:before {
content: "\e5db";
}
}
@@ -13,91 +13,145 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@import "../variables";
@import "../mixins";
.mdl-list {
display: block;
padding: 8px 0 ;
padding: $list-border 0;
list-style: none;
}
.mdl-list__item {
@include typo-body-1();
@include typo-subhead();
line-height: 1;
display: flex;
min-height: $list-min-height;
box-sizing: border-box;
height: 48px;
flex-direction: row;
flex-wrap: nowrap;
align-items: center;
padding : 16px 16px 20px 16px;
padding: $list-min-padding;
cursor: default;
color: $list-main-text-text-color;
overflow: hidden;
& .mdl-list__item-primary-content {
order:0;
order: 0;
flex-grow: 2;
text-decoration: none;
box-sizing: border-box;
display: flex;
align-items: center;
& .material-icons {
font-size: 40px;
line-height: 0;
vertical-align: middle;
padding: 0 12px 0 0;
& .mdl-list__item-icon {
margin-right: $list-icon-text-left-distance - $list-icon-size - $list-min-padding;
}
& .mdl-list__item-avatar {
margin-right: $list-avatar-text-left-distance - $list-avatar-size - $list-min-padding;
}
}
& .mdl-list__item-secondary-content {
display: flex;
flex-flow: column;
align-items: flex-end;
margin-left: $list-min-padding;
& .mdl-list__item-secondary-action label { display: inline; }
& .mdl-list__item-secondary-info {
@include typo-caption();
margin-bottom: 10px;
color: $list-supporting-text-text-color;
}
& .mdl-list__item-sub-header {
padding: 0 0 0 16px;
padding: 0 0 0 $list-min-padding;
}
}
}
.mdl-list__item-avatar {
height: 56px;
.mdl-list__item-icon,
.mdl-list__item-icon.material-icons {
height: $list-icon-size;
width: $list-icon-size;
font-size: $list-icon-size;
box-sizing: border-box;
color: $list-icon-color;
}
.mdl-list__item-avatar,
.mdl-list__item-avatar.material-icons {
height: $list-avatar-size;
width: $list-avatar-size;
box-sizing: border-box;
border-radius: 50%;
// Set a background colour in case the user doesn't provide an image.
background-color: $list-icon-color;
// Set a font size and color in case the user provides a Material Icon.
font-size: $list-avatar-size;
color: $list-avatar-color;
}
.mdl-list__item--two-line {
height: 72px;
height: $list-two-line-height;
& .mdl-list__item-primary-content {
& .material-icons {
vertical-align: text-bottom;
height: $list-two-line-height - $list-min-padding - $list-bottom-padding;
line-height: 20px;
display: block;
& .mdl-list__item-avatar{
float: left;
}
& .mdl-list__item-icon {
float: left;
// Icons are aligned to center of text in a two line list.
margin-top:
($list-two-line-height - $list-min-padding - $list-bottom-padding -
$list-icon-size) / 2;
}
& .mdl-list__item-secondary-content {
height: $list-two-line-height - $list-min-padding - $list-bottom-padding;
}
& .mdl-list__item-sub-title {
@include typo-caption();
@include typo-body-1();
line-height: 18px;
color: $list-supporting-text-text-color;
display: block;
padding : 0 0 0 56px;
padding: 0;
}
}
}
.mdl-list__item--three-line {
height: 88px;
height: $list-three-line-height;
& .mdl-list__item-primary-content {
& .material-icons {
vertical-align: text-bottom;
height: $list-three-line-height - $list-min-padding - $list-bottom-padding;
line-height: 20px;
display: block;
& .mdl-list__item-avatar,
& .mdl-list__item-icon {
float: left;
}
}
& .mdl-list__item-secondary-content {
height: $list-three-line-height - $list-min-padding - $list-bottom-padding;
}
& .mdl-list__item-text-body {
@include typo-caption();
@include typo-body-1();
line-height: 18px;
height: $list-three-line-height - $list-min-padding - $list-bottom-padding;
color: $list-supporting-text-text-color;
display: block;
height: 24px;
padding: 0 0 0 56px;
overflow: hidden;
padding: 0;
}
}
Oops, something went wrong.

0 comments on commit 018bf12

Please sign in to comment.