Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: Dragzone overlapping #1333

Merged
merged 6 commits into from
Dec 10, 2019
Merged

FIX: Dragzone overlapping #1333

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ead4b93
FIX: Dragzone overlapping
VladimirMikulic Dec 7, 2019
61ebd6f
FIX: Improve commit #ead4b932
VladimirMikulic Dec 7, 2019
e24d473
FIX: .import-image-zone input element width
VladimirMikulic Dec 7, 2019
e5df980
FIX: .import-image-zone max-width
VladimirMikulic Dec 7, 2019
f81216b
FIX: .import-image-zone input element max-width
VladimirMikulic Dec 7, 2019
97648c6
Merge branch 'main' into fix/dragzone-overlapping
jywarren Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions examples/demo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,24 @@ body > .container-fluid {
min-width:300px;
}

.hover {
background: #eee;
.dropzone input {
max-width: 100%;
}

.dropzone input {
.import-image-zone {
margin: 10px auto 30px auto;
max-width: 250px;
min-width: 230px;
}

.import-image-zone input {
max-width: 100%;
VladimirMikulic marked this conversation as resolved.
Show resolved Hide resolved
}

.hover {
background: #eee;
}

.step {
margin-bottom: 20px;
}
Expand Down Expand Up @@ -252,7 +262,7 @@ a.name-header{
}

.step-column{
display:flex;
display:flex;
align-content: center;
justify-content: center;
}
Expand All @@ -276,9 +286,9 @@ a.name-header{
width:100%;
}
.save-button{
margin-top:20px;
margin-top:20px;
margin-bottom:0px;
align:center;
align:center;
width:100%;
}

Expand All @@ -287,7 +297,7 @@ a.name-header{
}

.dimension-tooltip:hover{
text-decoration: none;
text-decoration: none;
}

.dimension-tooltip:focus{
Expand Down
2 changes: 1 addition & 1 deletion src/modules/ImportImage/Ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = function ImportImageModuleUi(step, ui) {

// add a file input listener
var dropZone = '\
<div class="dropzone" style="padding: 30px;margin: 10px 20% 30px;border: 4px dashed #ccc;border-radius: 8px;text-align: center;color: #444;" id="' + dropzoneId + '">\
<div class="dropzone import-image-zone" id="' + dropzoneId + '">\
<p>\
<i>Select or drag in an image to overlay.</i>\
</p>\
Expand Down