CSS and layout fixes for image uploader

closes #1673
- dropzone icon doesn't appear when filestorage is false
- proper cursor and no selection on icon
- cleaned up some sass
This commit is contained in:
Hannah Wolfe 2013-12-14 15:55:44 +00:00
parent 09d8329712
commit 3ef7f36ece
2 changed files with 19 additions and 13 deletions

View File

@ -193,7 +193,10 @@
} }
}); });
// Only show the toggle icon if there is a dropzone mode to go back to
if (settings.fileStorage !== false) {
$dropzone.append('<a class="image-upload" title="Add image"><span class="hidden">Upload</span></a>'); $dropzone.append('<a class="image-upload" title="Add image"><span class="hidden">Upload</span></a>');
}
$dropzone.find('a.image-upload').on('click', function () { $dropzone.find('a.image-upload').on('click', function () {
$dropzone.find('.js-url').remove(); $dropzone.find('.js-url').remove();

View File

@ -1333,7 +1333,6 @@ main {
.image-url, .image-url,
.image-upload { .image-upload {
@include icon($i-link, 12px);
line-height: 12px; line-height: 12px;
padding: 10px; padding: 10px;
display: block; display: block;
@ -1342,7 +1341,21 @@ main {
left: 0; left: 0;
color: $brown; color: $brown;
text-decoration: none; text-decoration: none;
@include user-select(none);
&:hover {
cursor: pointer;
} }
}
.image-webcam {
@include icon($i-camera, 12px);
}
.image-url {
@include icon($i-link, 12px);
}
.image-upload { .image-upload {
@include icon($i-image, 12px); @include icon($i-image, 12px);
} }
@ -1358,17 +1371,7 @@ main {
margin: 0 0 0 10px; margin: 0 0 0 10px;
} }
.image-webcam {
@include icon($i-camera, 12px);
line-height: 12px;
padding: 10px;
display: block;
position: absolute;
bottom: 0;
right: 0;
color: $brown;
text-decoration: none;
}
input { input {
&.main{ &.main{