Permalink
Browse files

merge

  • Loading branch information...
2 parents d8041c2 + 4b0a881 commit 99899d67a4f24590cbf45079e7837da00edffc6d @ericz committed Feb 18, 2012
Showing with 6 additions and 2 deletions.
  1. +5 −1 admin/public/css/style.css
  2. +1 −1 admin/public/js/index.js
@@ -2,6 +2,9 @@ html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,pre,code,form,fields
a {outline: none;} /* Gets rid of Firefox's dotted borders */
a img {border: none;} /* Gets rid of IE's blue borders */
+body, html {
+ background-color: #eaeaea;
+}
.rect {
width: 100px;
@@ -24,9 +27,10 @@ a img {border: none;} /* Gets rid of IE's blue borders */
#field {
width: 1000px;
height: 500px;
- border: 5px solid #d4d4d4;
+ border: 15px solid #d4d4d4;
margin: 50px auto;
position: relative;
+ background-color: #fff;
}
.green {
View
@@ -6,7 +6,7 @@ var physics;
var addRect = function addRect (w, h, callback) {
var close = $('<div></div>').addClass('close').click(deleteRect);
- $('<div></div>').data('o', 0).data('cb', callback).dblclick(rotate).addClass('rect').append(close).css({width: w/7, height: h/7, 'background-color': '#'+Math.floor(Math.random()*16777215).toString(16)}).draggable({snap:true, snapMode: 'outer'}).appendTo('#field');
+ $('<div></div>').data('o', 0).data('cb', callback).dblclick(rotate).addClass('rect').append(close).css({width: w/7, height: h/7, 'background-color': '#'+Math.floor(Math.random()*16777215).toString(16)}).draggable({snap:true, snapMode: 'outer', containment: 'parent'}).appendTo('#field');
};
var send = function send () {

0 comments on commit 99899d6

Please sign in to comment.