mrflos/memo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bug with chrome rendering sticker drag

Browse source
This commit is contained in:
ali asaria 2014-09-01 18:04:36 -04:00
parent cdcafae858
commit 85bd841154
4 changed files with 78 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
client/css/style.css
View file

@ -298,10 +298,13 @@ xopacity: .5;
} }
.sticker { .sticker {
padding-top: 3px; padding-top: 0px;
padding-left: 2px; padding-left: 2px;
xz-index:10; xz-index:10;
display: inline; display: inline-block;
width: 11px;
height: 11px;
background-repeat: no-repeat;
} }
.stickers { .stickers {
@ -316,6 +319,34 @@ xopacity: .5;
padding: 0; margin 0; padding: 0; margin 0;
} }
#sticker-red {
background-image: url('/images/stickers/sticker-red.png');
}
#sticker-blue {
background-image: url('/images/stickers/sticker-blue.png');
}
#sticker-yellow {
background-image: url('/images/stickers/sticker-yellow.png');
}
#sticker-green {
background-image: url('/images/stickers/sticker-green.png');
}
#sticker-pink {
background-image: url('/images/stickers/sticker-pink.png');
}
#sticker-lightblue {
background-image: url('/images/stickers/sticker-lightblue.png');
}
#sticker-orange {
background-image: url('/images/stickers/sticker-orange.png');
}
#sticker-purple {
background-image: url('/images/stickers/sticker-purple.png');
}
#nosticker {
background-image: url('/images/stickers/sticker-deletestar.png');
}
#sticker-nostar { #sticker-nostar {
position: relative; position: relative;
top: 3px; top: 3px;
@ -551,4 +582,3 @@ input:hover {
.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;} .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}
.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } .ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }

BIN
client/images/stickers/sticker-deletestar.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 2.9 KiB

9
views/index.jade
View file

@ -30,25 +30,16 @@ block body
div.stickers div.stickers
div.sticker#sticker-red div.sticker#sticker-red
image(src="/images/stickers/sticker-red.png")
div.sticker#sticker-blue div.sticker#sticker-blue
image(src="/images/stickers/sticker-blue.png")
div.sticker#sticker-yellow div.sticker#sticker-yellow
image(src="/images/stickers/sticker-yellow.png")
div.sticker#sticker-green div.sticker#sticker-green
image(src="/images/stickers/sticker-green.png")
br br
div.sticker#sticker-pink div.sticker#sticker-pink
image(src="/images/stickers/sticker-pink.png")
div.sticker#sticker-lightblue div.sticker#sticker-lightblue
image(src="/images/stickers/sticker-lightblue.png")
div.sticker#sticker-orange div.sticker#sticker-orange
image(src="/images/stickers/sticker-orange.png")
div.sticker#sticker-purple div.sticker#sticker-purple
image(src="/images/stickers/sticker-purple.png")
br br
div.sticker#nosticker div.sticker#nosticker
image(src="/images/stickers/sticker-deletestar.png")
//br //br
//div.sticker#sticker-gold //div.sticker#sticker-gold
// image(src="/images/stickers/sticker-gold.png") // image(src="/images/stickers/sticker-gold.png")

2
views/layout.jade
View file

@ -6,7 +6,7 @@ html(lang="en")
<!-- jQuery --> <!-- jQuery -->
<script src="/lib/jquery-1.5.1.min.js"></script> <script src="/lib/jquery-1.5.1.min.js"></script>
<!-- <script src="/lib/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script> --> <!-- <script src="/lib/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script> -->
<script src="/lib/jquery-ui/development-bundle/ui/jquery-ui-1.8.9.custom.js"></script> <script src="https://code.jquery.com/ui/1.11.1/jquery-ui.js"></script>
<!-- External Scripts --> <!-- External Scripts -->
<script src="/lib/jquery.ui.touch-punch.min.js"></script> <script src="/lib/jquery.ui.touch-punch.min.js"></script>