From 977c1cc6e511d752e083081adbed9f8fda1d0312 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Sat, 22 Feb 2014 22:34:51 -0600 Subject: [PATCH] fix(thumbnail): Correctly apply thumbnail style to item directive, closes #509 --- js/ext/angular/test/list.html | 8 +------- scss/_items.scss | 12 ++++++++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/js/ext/angular/test/list.html b/js/ext/angular/test/list.html index d2f7a8e00ba..a60a05e8773 100644 --- a/js/ext/angular/test/list.html +++ b/js/ext/angular/test/list.html @@ -67,12 +67,6 @@ .my-repeat-animation > .ng-move.ng-move-active { opacity:1; } - .item-message img { - float: left; - width: 50px; - height: 50px; - margin-right: 10px; - } @@ -115,7 +109,7 @@

List Tests

option-buttons="optionButtons1"> - +

{{item.from}}

{{item.text}}

diff --git a/scss/_items.scss b/scss/_items.scss index e919adc0aad..4a7ffddb8ac 100644 --- a/scss/_items.scss +++ b/scss/_items.scss @@ -438,7 +438,8 @@ button.item-button-right:after, // Item Thumbnails // ------------------------------- -.item-thumbnail-left { +.item-thumbnail-left, +.item-thumbnail-left .item-content { padding-left: $item-thumbnail-width + $item-thumbnail-margin + $item-padding; min-height: $item-thumbnail-height + ($item-thumbnail-margin * 2); @@ -451,8 +452,12 @@ button.item-button-right:after, width: 100%; } } +.item-thumbnail-left.item-complex { + padding-left: 0; +} -.item-thumbnail-right { +.item-thumbnail-right, +.item-thumbnail-right .item-content { padding-right: $item-thumbnail-width + $item-thumbnail-margin + $item-padding; min-height: $item-thumbnail-height + ($item-thumbnail-margin * 2); @@ -465,6 +470,9 @@ button.item-button-right:after, width: 100%; } } +.item-thumbnail-left.item-complex { + padding-right: 0; +} // Item Image