From d38c5c77d435acfaa316dc0275843c5de115f576 Mon Sep 17 00:00:00 2001 From: Mattias Erming Date: Sat, 5 Jul 2014 01:32:40 +0200 Subject: [PATCH] Added user search --- Gruntfile.js | 2 +- client/css/style.css | 39 ++++++++++++++++++++++++++++++++++----- client/index.html | 11 +++++------ client/js/chat.js | 39 +++++++++++++++++++++++++++++++++------ 4 files changed, 73 insertions(+), 18 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 9560f52..ee8f901 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -2,7 +2,7 @@ module.exports = function(grunt) { var components = ""; var files = [ "./lib/**/*.js", - "./client/js/shout.js" + "./client/js/chat.js" ]; grunt.initConfig({ watch: { diff --git a/client/css/style.css b/client/css/style.css index feb6517..b081858 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -11,6 +11,7 @@ body { height: 100%; } body { + background: #fff; color: #222; font: 16px Lato, sans-serif; margin: 0; @@ -245,7 +246,7 @@ button { display: inline; } #meta { - border-bottom: 1px solid #e9ecef; + height: 80px; padding: 25px 0 0 20px; } @@ -253,18 +254,46 @@ button { color: #222; font-size: 15px; } -#meta .count { - color: #ccc; -} #meta .type { + color: #ccc; text-transform: capitalize; } +#count { + background: #f9f9f9; + border-top: 1px dashed #e9ecef; + border-bottom: 1px solid #e9ecef; + height: 40px; + left: 0; + position: absolute; + right: 0; + top: 80px; +} +#count:before { + color: #eee; + font: 16px Octicons; + content: "\f02e"; + position: absolute; + right: 18px; + line-height: 40px; + transition: color .2s; +} +#search { + color: #222; + border: 0; + background: none; + font: inherit; + outline: 0; + padding: 12px 20px; + position: relative; + width: 100%; + z-index: 2; +} #users { bottom: 0; overflow: auto; padding: 15px 20px; position: absolute; - top: 80px; + top: 120px; width: 100%; } #users button { diff --git a/client/index.html b/client/index.html index 442a2fc..affb2dc 100644 --- a/client/index.html +++ b/client/index.html @@ -71,16 +71,15 @@