More theme and sort adjustments

mrb · Mar 23, 2010 · a2f35d9 · a2f35d9
1 parent f3fe6e0
commit a2f35d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/_attachments/javascripts/app.js b/_attachments/javascripts/app.js
@@ -697,13 +697,14 @@
             .sortable({
               items: '.slide',
               axis: 'y',
+              scrollSpeed: 60,
               stop: function(event, ui) {
                 e.trigger('slide-sort', {preso: preso, order: $(this).sortable('toArray')});
               }
             })
             // clicking a slide goes to that slide
             .find('.slide')
-              .click(function() {
+              .dblclick(function() {
                 var slide_id = $(this).attr('id').replace('sort-slide-', '');
                 e.redirect('#','preso', preso.id(), 'edit', slide_id);
               })
@@ -733,8 +734,8 @@
             .find('textarea[name="slide[content]"]')
               .tabby()
               .bind('keyup', function(ev) {
-                if ((ev.which == $.ui.keyCode.ENTER) && ev.ctrlKey) {
-                  ev.preventDefault();
+                if ((ev.which == $.ui.keyCode.RIGHT) && ev.ctrlKey) {
+                  ev.stopImmediatePropagation();
                   $(this).parents('form').submit();
                 } else {
                   slide_preview.drawPreview($(this).val());

diff --git a/_attachments/stylesheets/swinger.css b/_attachments/stylesheets/swinger.css
@@ -239,6 +239,8 @@ iframe {
 }
 .slide-sort .slide .slide-num {
   position: absolute;
+  line-height: 100%;
+  font-family: Arial, sans-serif;
   bottom: 10px;
   right: 10px;
   text-align: center;
@@ -347,6 +349,7 @@ iframe {
 .simple-form input[type=text],
 .simple-form input[type=password] {
   width: 250px;
+  font-size: 14px;
 }
 .simple-form .submit {
   float:none;

diff --git a/_attachments/stylesheets/themes.css b/_attachments/stylesheets/themes.css
@@ -43,7 +43,7 @@
 }
 .slide .content pre {
   font-family: Inconsolata, Monaco, Courier, mono;
-  font-size: 80%;
+  font-size: 100%;
 }
 .slide .content em {
   font-style: italic;
@@ -332,6 +332,7 @@ pre.sh_sourceCode .sh_value{color:#f00;font-weight:normal;font-style:normal;}
 .sammy pre.prettyprint {
   margin: 2% 0;
   padding: 2%;
+  word-spacing: 0.1em;
 }
 .sammy pre.sh_sourceCode{background-color:#ECECEC;color:#000;font-weight:normal;font-style:normal;}
 .sammy pre.sh_sourceCode .sh_keyword{color:#66B0D6;font-weight:bold;font-style:normal;}