From 91edc63d02ec00ba0f692dbcda06307423ad652b Mon Sep 17 00:00:00 2001 From: Vladimir Lugovsky Date: Mon, 23 Nov 2015 18:49:01 +0300 Subject: [PATCH] feat(dashboardFeed): add dashboard feed sub-icon --- .../dashboard/widgets/blurFeed/_blurFeed.scss | 59 ++++++++++++++++-- .../dashboard/widgets/blurFeed/blurFeed.html | 8 ++- src/assets/img/feed-image.svg | 24 +++++++ src/assets/img/feed-location.svg | 13 ++++ src/assets/img/feed-video.svg | 5 ++ src/assets/img/palette.png | Bin 0 -> 8908 bytes 6 files changed, 104 insertions(+), 5 deletions(-) create mode 100644 src/assets/img/feed-image.svg create mode 100644 src/assets/img/feed-location.svg create mode 100644 src/assets/img/feed-video.svg create mode 100644 src/assets/img/palette.png diff --git a/src/app/pages/dashboard/widgets/blurFeed/_blurFeed.scss b/src/app/pages/dashboard/widgets/blurFeed/_blurFeed.scss index 08bf33b..781659f 100644 --- a/src/app/pages/dashboard/widgets/blurFeed/_blurFeed.scss +++ b/src/app/pages/dashboard/widgets/blurFeed/_blurFeed.scss @@ -11,11 +11,62 @@ padding-top: 0; } - img { - float: left; - border-radius: 30px; + .message-icon { width: 60px; height: 60px; + float: left; + position: relative; + + > img, .media-icon { + border-radius: 30px; + width: 100%; + height: 100%; + } + + .media-icon { + display: inline-block; + padding: 4px; + &:after { + content: ''; + display: inline-block; + width: 52px; + height: 52px; + background-size: contain; + } + &.video-message { + background: $video-message-color; + &:after { + background-image: url(../img/feed-video.svg); + } + } + &.image-message { + background: $image-message-color; + padding: 15px; + &:after { + width: 30px; + height: 30px; + background-image: url(../img/feed-image.svg); + } + } + &.geo-message { + background: $geo-message-color; + padding: 15px; + &:after { + width: 30px; + height: 30px; + background-image: url(../img/feed-location.svg); + } + } + } + + .sub-photo-icon { + position: absolute; + width: 25px; + height: 25px; + right: -2px; + bottom: -2px; + border: 2px solid #fff; + } } .text-block { @@ -130,7 +181,7 @@ } &.right { - img { + .message-icon { float: right; } .text-block { diff --git a/src/app/pages/dashboard/widgets/blurFeed/blurFeed.html b/src/app/pages/dashboard/widgets/blurFeed/blurFeed.html index f220fc2..40c1dc6 100644 --- a/src/app/pages/dashboard/widgets/blurFeed/blurFeed.html +++ b/src/app/pages/dashboard/widgets/blurFeed/blurFeed.html @@ -1,7 +1,13 @@
- +
+ +
+
+ + +
{{ ::message.author }}{{ ::message.header }} diff --git a/src/assets/img/feed-image.svg b/src/assets/img/feed-image.svg new file mode 100644 index 0000000..5bb98bc --- /dev/null +++ b/src/assets/img/feed-image.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/src/assets/img/feed-location.svg b/src/assets/img/feed-location.svg new file mode 100644 index 0000000..226f4c1 --- /dev/null +++ b/src/assets/img/feed-location.svg @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/src/assets/img/feed-video.svg b/src/assets/img/feed-video.svg new file mode 100644 index 0000000..0e78d4b --- /dev/null +++ b/src/assets/img/feed-video.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/img/palette.png b/src/assets/img/palette.png new file mode 100644 index 0000000000000000000000000000000000000000..ffb62a8bc4b44c0b95c877238ba9488b208f517e GIT binary patch literal 8908 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 a{|^99(z$E0C0000