diff --git a/client/css/style.css b/client/css/style.css index b6f82b5..9e45eda 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -480,6 +480,11 @@ input:hover { } #marker { + position: absolute; bottom: 0; right: 200px; + z-index: 1; +} + +#eraser { position: absolute; bottom: 0; right: 70px; z-index: 1; } @@ -502,6 +507,7 @@ input:hover { + /* states and images */ .ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } diff --git a/client/images/eraser.png b/client/images/eraser.png new file mode 100644 index 0000000..b87dbf2 Binary files /dev/null and b/client/images/eraser.png differ diff --git a/client/images/marker.png b/client/images/marker.png new file mode 100644 index 0000000..55095aa Binary files /dev/null and b/client/images/marker.png differ diff --git a/client/script.js b/client/script.js index b3ddff4..e7fe575 100644 --- a/client/script.js +++ b/client/script.js @@ -825,7 +825,19 @@ $( ".board-outline" ).resizable( { -//$('#marker').draggable(); +$('#marker').draggable( + { + axis: 'x', + containment: 'parent' + } +); + +$('#eraser').draggable( + { + axis: 'x', + containment: 'parent' + } +); diff --git a/views/index.jade b/views/index.jade index 10de26c..dd16fbb 100644 --- a/views/index.jade +++ b/views/index.jade @@ -6,7 +6,8 @@ h1 scrumblr by al div.board-outline div#board div#board-doodles - image#marker(src='/images/marker-and-eraser.png', width='259', height='20') + image#marker(src='/images/marker.png') + image#eraser(src='/images/eraser.png') table#board-table.board-table