Merge pull request #239 from simonlnu/master

multiple ui and other fixes
2012-04-16 21:29:05 -07:00 · 2012-04-16 21:29:05 -07:00 · 621bf6bab4
parent f08844a8a5 68e1523496
commit 621bf6bab4
3 changed files with 1571 additions and 1462 deletions
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@ -346,4 +346,3 @@ function enableOnUser(){
 	}

 </script>
-
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css