Merge remote-tracking branch 'paradox460/dumplist-changes'

This commit is contained in:
ccd0 2016-02-26 21:33:45 -08:00
commit a50a56b780
2 changed files with 24 additions and 6 deletions

View File

@ -365,7 +365,7 @@ QR.post = class
reader.readAsText file reader.readAsText file
dragStart: (e) -> dragStart: (e) ->
e.dataTransfer.setDragImage @, e.layerX, e.layerY e.dataTransfer.setDragImage @, 0, 0
$.addClass @, 'drag' $.addClass @, 'drag'
dragEnd: -> $.rmClass @, 'drag' dragEnd: -> $.rmClass @, 'drag'
dragEnter: -> $.addClass @, 'over' dragEnter: -> $.addClass @, 'over'

View File

@ -1585,11 +1585,20 @@ input[type="checkbox"]:checked ~ .checkbox-letter {
} }
#dump-list { #dump-list {
overflow-x: auto; overflow-x: auto;
overflow-y: hidden; overflow-y: auto;
white-space: nowrap; white-space: nowrap;
width: 248px; width: 248px;
max-height: 248px;
min-height: 90px;
max-width: 100%; max-width: 100%;
min-width: 100%; min-width: 100%;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
} }
#dump-list:hover { #dump-list:hover {
overflow-x: auto; overflow-x: auto;
@ -1606,7 +1615,10 @@ input[type="checkbox"]:checked ~ .checkbox-letter {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
text-shadow: 0 0 2px #000; text-shadow: 0 0 2px #000;
-moz-transition: opacity .25s ease-in-out; -webkit-transition: opacity .25s ease-in-out, -webkit-transform .25s ease-in-out;
transition: opacity .25s ease-in-out, -webkit-transform .25s ease-in-out;
transition: opacity .25s ease-in-out, transform .25s ease-in-out;
transition: opacity .25s ease-in-out, transform .25s ease-in-out, -webkit-transform .25s ease-in-out;
vertical-align: top; vertical-align: top;
background-size: cover; background-size: cover;
} }
@ -1627,9 +1639,15 @@ input[type="checkbox"]:checked ~ .checkbox-letter {
} }
.qr-preview.drag { .qr-preview.drag {
box-shadow: 0 0 10px rgba(0,0,0,.5); box-shadow: 0 0 10px rgba(0,0,0,.5);
-webkit-transform: scale(.8);
transform: scale(.8);
} }
.qr-preview.over { .qr-preview.over {
border-color: #fff; border-color: #fff;
-webkit-transform: scale(1.1);
transform: scale(1.1);
opacity: 0.9;
z-index: 10;
} }
.qr-preview > span { .qr-preview > span {
color: #fff; color: #fff;
@ -1665,7 +1683,7 @@ a:only-of-type > .remove {
cursor: pointer; cursor: pointer;
font-size: 2em; font-size: 2em;
position: absolute; position: absolute;
top: 50%; bottom: 20px;
right: 10px; right: 10px;
-moz-transform: translateY(-50%); -moz-transform: translateY(-50%);
} }