Permalink
Browse files

Merge branch 'master' of github.com:waterbearlang/waterbear into 69-l…

…ocal-vars
  • Loading branch information...
2 parents a806e20 + f12c6fa commit 9a7e95597749f258a93a88f0b5793565854cf6e0 delza committed Jan 7, 2012
Showing with 15 additions and 5 deletions.
  1. +2 −2 garden.html
  2. +5 −0 plugins/javascript.js
  3. +8 −3 stylesheets/workspace.css
View
@@ -65,7 +65,7 @@ <h3 class="select">About Waterbear</h3>
<div class="hidden dialog" id="restore_dialog">
<div id="restore_dialog_contents">
<h2>Restore a script</h2>
- <ul id="script_list">
+ <ul class="scrollList" id="script_list">
</ul>
<button class="cancel">Cancel</button>
<button class="exp">From Export</button>
@@ -74,7 +74,7 @@ <h3 class="select">About Waterbear</h3>
<div class="hidden dialog" id="demos_dialog">
<div id="demos_dialog_contents">
<h2>Load a demo</h2>
- <ul id="demo_list">
+ <ul class="scrollList" id="demo_list">
</ul>
<button class="cancel">Cancel</button>
</div>
View
@@ -1064,4 +1064,9 @@ populate_demos_dialog(demos);
load_current_scripts();
$('.scripts_workspace').trigger('init');
console.log("Done");
+
+$('.socket input').live('click',function(){
+ $(this).focus();
+ $(this).select();
+});
}
View
@@ -56,14 +56,15 @@ body {
height: 95%;
background-color: #FFF;
border: 1px solid #CCC;
+ overflow-x: hidden;
+ overflow-y: auto;
}
.scripts_workspace, .scripts_text_view {
- min-width: 100%;
+ min-width: 50%;
min-height: 100%;
position: relative;
display: none;
- overflow: auto;
padding: 15px;
}
@@ -302,4 +303,8 @@ html, body {
overflow: hidden;
}
-
+/* Lists of scripts to scroll. Used in demo & restore dialog*/
+.scrollList{
+ max-height: 300px;
+ overflow-y:scroll;
+}

0 comments on commit 9a7e955

Please sign in to comment.