From 5fb4ea275811ac850237012214a4e0ff610ef310 Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Fri, 25 Oct 2013 21:56:53 +0200 Subject: [PATCH 1/2] Larger font for input, clean CSS --- css/glowingbear.css | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/css/glowingbear.css b/css/glowingbear.css index 3b20813..ec8a621 100644 --- a/css/glowingbear.css +++ b/css/glowingbear.css @@ -92,23 +92,17 @@ body { } input#sendMessage { - border: 0; width: 100%; + font-size: large; +} +#footer button { + border-radius: 0; } .panel input, .panel .input-group { max-width: 300px; } input[type=text], input[type=password], .badge { border: 0; - -webkit-box-shadow: - inset 0 0 8px rgba(0,0,0,0.4), - 0 0 16px rgba(0,0,0,0.4); - -moz-box-shadow: - inset 0 0 8px rgba(0,0,0,0.4), - 0 0 16px rgba(0,0,0,0.4); - box-shadow: - inset 0 0 8px rgba(0,0,0,0.4), - 0 0 16px rgba(0,0,0,0.4); border-radius: 0; color: #6e6e6e; box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.1), 0px 1px 7px 0px rgba(0, 0, 0, 0.8) inset; From c9f7e9a73253e9387acd71b4822f8d295626d7ed Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Fri, 25 Oct 2013 22:19:23 +0200 Subject: [PATCH 2/2] Make scrolling into the bufferlines div, not the whole window This should improve scrolling experience, especially on webkit. It also is needed for when nicklist will appear --- css/glowingbear.css | 12 ++++++------ index.html | 2 +- js/websockets.js | 7 ++++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/css/glowingbear.css b/css/glowingbear.css index ec8a621..b4c407e 100644 --- a/css/glowingbear.css +++ b/css/glowingbear.css @@ -174,16 +174,16 @@ input[type=text], input[type=password], .badge { min-height: 100%; } -.bufferlines { +#bufferlines { font-family: 'Terminus', 'Inconsolata', 'Consolas', 'Monaco', 'Ubuntu Mono', monospace; + position: relative; + height: 99%; overflow-y: auto; margin-left: 14%; width: auto; - position: relative; - padding-bottom: 60px; /* bottom input */ - padding-top: 35px; /* topbar */ + top: 25px; /* topbar */ } -.bufferlines .btn { +#bufferlines .btn { font-family: sans-serif; } @@ -191,7 +191,7 @@ input[type=text], input[type=password], .badge { margin: 0 5px 0 14%; } @media (max-width: 968px) { - #sidebar, .bufferlines { + #sidebar, #bufferlines { position: relative; min-height: 0; margin-left: 0; diff --git a/index.html b/index.html index f2b003a..591e1ac 100644 --- a/index.html +++ b/index.html @@ -211,7 +211,7 @@ -
+
diff --git a/js/websockets.js b/js/websockets.js index e7dae9e..f44cf38 100644 --- a/js/websockets.js +++ b/js/websockets.js @@ -427,10 +427,11 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', if(readmarker) { readmarker.scrollIntoView(); }else{ - var sTop = document.documentElement.scrollTop; - var sVal = document.documentElement.scrollHeight - document.documentElement.clientHeight; + var bl = document.getElementById('bufferlines'); + var sTop = bl.scrollTop; + var sVal = bl.scrollHeight - bl.clientHeight; if(sTop < sVal) { - document.documentElement.scrollTop = sVal; + bl.scrollTop = sVal; } } }