Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add camera/picture icon to messages #129

Merged
merged 4 commits into from
Jul 24, 2014
Merged

Add camera/picture icon to messages #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81abeef
Add icon-camera svg
leecrossley Jul 24, 2014
5a7f3d8
Add picture/camera icon to kitchen sink messages
leecrossley Jul 24, 2014
a2a6cd4
Update dist
leecrossley Jul 24, 2014
8b6fbf8
Revert dist to 9bd67dc
leecrossley Jul 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions kitchen-sink/jade/messages.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.navbar-inner
.left.sliding
a(href="index.html").back.link
i.icon.icon-back-blue
i.icon.icon-back-blue
span Back
.center.sliding Messages
.right
Expand All @@ -12,11 +12,13 @@
.page(data-page="messages").no-toolbar.toolbar-fixed
.toolbar.messagebar
.toolbar-inner
a(href="#").link.icon-only
i.icon.icon-camera
textarea(placeholder="Message")
a(href="#").link Send
.page-content.messages-content
.messages
.messages-date Sunday, Feb 9,
.messages-date Sunday, Feb 9,
span 12:58
.message.message-sent
.message-text Hi, Kate
Expand All @@ -30,40 +32,40 @@
.message-name Blue Ninja
.message-text Hi there, I am also fine, thanks! And how are you?
.message-avatar(style="background-image:url(http://lorempixel.com/output/people-q-c-100-100-7.jpg)")
.message.message-sent
.message.message-sent
.message-text Hey, Blue Ninja! Glad to see you ;)
.message.message-sent
.message.message-sent
.message-text What do you think about my new logo?
.messages-date Wednesday, Feb 12,
.messages-date Wednesday, Feb 12,
span 19:33
.message.message-sent
.message.message-sent
.message-text Hey? Any thoughts about my new logo?
.messages-date Thursday, Feb 13,
.messages-date Thursday, Feb 13,
span 11:20
.message.message-sent
.message.message-sent
.message-text Alo...
.message.message-sent
.message.message-sent
.message-text Are you there?
.message.message-received.message-with-avatar
.message.message-received.message-with-avatar
.message-name Blue Ninja
.message-text Hi, i am here
.message-avatar(style="background-image:url(http://lorempixel.com/output/people-q-c-100-100-7.jpg)")
.message.message-received.message-with-avatar
.message.message-received.message-with-avatar
.message-name Blue Ninja
.message-text Your logo is great
.message-avatar(style="background-image:url(http://lorempixel.com/output/people-q-c-100-100-7.jpg)")
.message.message-received.message-with-avatar
.message.message-received.message-with-avatar
.message-name Kate Johnson
.message-text Leave me alone!
.message-avatar(style="background-image:url(http://lorempixel.com/output/people-q-c-100-100-9.jpg)")
.message.message-sent
.message.message-sent
.message-text :(
.message.message-sent
.message.message-sent
.message-text Hey, look, cutest kitten ever!
.message.message-sent
.message-text
.message-text
img(src="http://placekitten.com/g/300/400")
.message.message-received.message-with-avatar
.message.message-received.message-with-avatar
.message-name Blue Ninja
.message-text Yep
.message-avatar(style="background-image:url(http://lorempixel.com/output/people-q-c-100-100-7.jpg)")
.message-avatar(style="background-image:url(http://lorempixel.com/output/people-q-c-100-100-7.jpg)")
10 changes: 5 additions & 5 deletions kitchen-sink/messages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
<div class="pages navbar-through">
<div data-page="messages" class="page no-toolbar toolbar-fixed">
<div class="toolbar messagebar">
<div class="toolbar-inner">
<div class="toolbar-inner"><a href="#" class="link icon-only"><i class="icon icon-camera"></i></a>
<textarea placeholder="Message"></textarea><a href="#" class="link">Send</a>
</div>
</div>
<div class="page-content messages-content">
<div class="messages">
<div class="messages-date">Sunday, Feb 9, <span>12:58</span></div>
<div class="messages-date">Sunday, Feb 9,<span>12:58</span></div>
<div class="message message-sent">
<div class="message-text">Hi, Kate</div>
</div>
Expand All @@ -38,11 +38,11 @@
<div class="message message-sent">
<div class="message-text">What do you think about my new logo?</div>
</div>
<div class="messages-date">Wednesday, Feb 12, <span>19:33</span></div>
<div class="messages-date">Wednesday, Feb 12,<span>19:33</span></div>
<div class="message message-sent">
<div class="message-text">Hey? Any thoughts about my new logo?</div>
</div>
<div class="messages-date">Thursday, Feb 13, <span>11:20</span></div>
<div class="messages-date">Thursday, Feb 13,<span>11:20</span></div>
<div class="message message-sent">
<div class="message-text">Alo...</div>
</div>
Expand Down Expand Up @@ -73,7 +73,7 @@
<div class="message message-sent">
<div class="message-text"><img src="http://placekitten.com/g/300/400"/></div>
</div>
<div class="message message-received message-with-avatar">
<div class="message message-received message-with-avatar">
<div class="message-name">Blue Ninja</div>
<div class="message-text">Yep</div>
<div style="background-image:url(http://lorempixel.com/output/people-q-c-100-100-7.jpg)" class="message-avatar"></div>
Expand Down
5 changes: 5 additions & 0 deletions src/less/icons.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ i.icon {
height: 13px;
background-image: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 42 26' fill='%23000'><rect width='4' height='4'/><rect x='8' y='1' width='34' height='2'/><rect y='11' width='4' height='4'/><rect x='8' y='12' width='34' height='2'/><rect y='22' width='4' height='4'/><rect x='8' y='23' width='34' height='2'/></svg>");
}
&.icon-camera {
width: 44px;
height: 44px;
background-image: url("data:image/svg+xml;charset=utf-8,<svg xmlns='http://www.w3.org/2000/svg' fill='%238C8C91' viewBox='0 0 100 100' enable-background='new 0 0 100 100' xml:space='preserve'><path d='M51.203,39.533c-6.251,0-11.316,5.066-11.316,11.316s5.064,11.316,11.316,11.316c6.25,0,11.317-5.066,11.317-11.316 S57.453,39.533,51.203,39.533z'/> <path d='M72.987,31H65.36c-0.457-3-2.357-4-4.635-4H39.37c-2.276,0-4.178,1-4.633,4h-7.363C24.205,31,21,33.38,21,36.548v28.714 C21,68.432,24.205,71,27.374,71h45.613C76.156,71,78,68.432,78,65.262V36.548C78,33.38,76.156,31,72.987,31z M28.892,41.667 c-1.87,0-3.385-1.516-3.385-3.385c0-1.872,1.515-3.386,3.385-3.386c1.87,0,3.386,1.515,3.386,3.386 C32.278,40.151,30.762,41.667,28.892,41.667z M51.201,65.225c-7.939,0-14.374-6.209-14.374-14.147 C36.828,43.606,42.523,37,49.811,37h2.784c7.286,0,12.982,6.606,12.982,14.077C65.577,59.016,59.141,65.225,51.201,65.225z'/></svg>");
}
&.icon-f7 {
width: 29px;
height: 29px;
Expand Down
9 changes: 6 additions & 3 deletions src/less/messagebar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,17 @@
.link {
.align-self(flex-end);
}
.link + textarea {
.link.icon-only {
margin-left: -6px;
}
.link:not(.icon-only) + textarea {
margin-left: 8px;
}
textarea + .link {
margin-left: 8px;
}
.link {
.flex-shrink(0);
.flex-shrink(0);
}
~ .page-content {
padding-bottom: 44px;
Expand All @@ -48,4 +51,4 @@
.translate3d(0,0,0);
.transition(0ms);
}
}
}