From dd697c4918e938d245c1037f1c859cf7f03b2616 Mon Sep 17 00:00:00 2001 From: Mattias Erming Date: Fri, 26 Sep 2014 17:21:14 -0700 Subject: [PATCH] Change colors --- client/css/style.css | 15 +++++++-------- client/js/shout.js | 7 +------ package.json | 2 +- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/client/css/style.css b/client/css/style.css index bf72ba8..693b3b2 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -703,7 +703,9 @@ button { } #form { background: #e4eaee; + background: #eee; border-top: 1px solid #cfdae1; + border-top: 1px solid #ddd; bottom: 0; height: 48px; left: 0; @@ -722,19 +724,19 @@ button { font: 12px Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace; left: 0; height: 34px; - margin-right: 60px; + margin-right: 64px; position: relative; } #form #nick { background: #f6f6f6; - color: #aaa; + color: #666; position: absolute; font: inherit; font-size: 11px; margin: 5px; line-height: 26px; height: 24px; - padding: 0 10px; + padding: 0 9px; border-radius: 1px; -webkit-user-select: none; -moz-user-select: none; @@ -743,6 +745,7 @@ button { } #form #input { border: 1px solid #cfdae1; + border: 1px solid #ddd; font: inherit; border-radius: 2px; height: 100%; @@ -760,14 +763,10 @@ button { font: 12px Lato, sans-serif; color: #555; height: 34px; - opacity: .5; position: absolute; right: 0; transition: opacity .3s; - width: 54px; -} -#form #submit.enabled { - opacity: 1; + width: 58px; } /** diff --git a/client/js/shout.js b/client/js/shout.js index 7e860e0..73483cd 100644 --- a/client/js/shout.js +++ b/client/js/shout.js @@ -362,17 +362,12 @@ $(function() { clear(); return; } - submit.removeClass("enabled"); socket.emit("input", { target: chat.data("id"), text: text }); }); - form.on("input", "#input", function() { - submit.toggleClass("enabled", $(this).val() != ""); - }); - chat.on("click", ".messages", focus); $(window).on("focus", focus); @@ -743,7 +738,7 @@ $(function() { .html(nick + ":") .width(); if (width) { - width += 34; + width += 31; input.css("padding-left", width); } } diff --git a/package.json b/package.json index 2a175ac..3b460cd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "shout", "description": "The self-hosted web IRC client", - "version": "0.37.0", + "version": "0.37.1", "author": "Mattias Erming", "preferGlobal": true, "bin": {