Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-26 15:59:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

working on making the scrollbar appear in the right place

Browse Source
This commit is contained in:
Micah Lee 2014-06-19 20:47:09 -04:00
parent 5865fd60ea
commit 3e65bf7884
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
onionshare_gui/static/onionshare.js
View File

@ -6,6 +6,7 @@ $(function(){
$('#log').append($line); $('#log').append($line);
// scroll to bottom // scroll to bottom
set_log_height();
$('#log').scrollTop($('#log').height()); $('#log').scrollTop($('#log').height());
} }
@ -115,4 +116,12 @@ $(function(){
}); });
} }
}); });
// make sure the log always has a height set, so it will have its own scrollbar
function set_log_height() {
var new_height = $(document).height() - 140; // header = 100, footer = 40
$('#log').css('height', new_height);
}
set_log_height();
$.resize(set_log_height);
}); });

10
onionshare_gui/static/style.css
View File

@ -1,7 +1,3 @@
html, body {
height: 100%;
}
body { body {
color: #000000; color: #000000;
font-family: arial; font-family: arial;
@ -10,11 +6,10 @@ body {
background-color: #f0f0f0; background-color: #f0f0f0;
min-width: 550px; min-width: 550px;
min-height: 300px; min-height: 300px;
overflow: hidden;
} }
#wrapper { #wrapper {
position: relative;
height: 100%;
} }
#header { #header {
@ -65,6 +60,7 @@ ul#log {
word-wrap: break-word; word-wrap: break-word;
font-family: monospace; font-family: monospace;
border-bottom: 1px solid #000000; border-bottom: 1px solid #000000;
width: 100%;
} }
ul#log li { ul#log li {
margin: 0 10px; margin: 0 10px;
@ -100,7 +96,7 @@ ul#log #close-countdown {
} }
#footer { #footer {
position: absolute; position: fixed;
bottom: 0; bottom: 0;
height: 20px; height: 20px;
background-color: #ffffff; background-color: #ffffff;