TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-01 05:50:35 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1674 from ErisDS/css-fixes

Browse Source 
CSS and layout fixes for image uploader
This commit is contained in:
Hannah Wolfe 2013-12-14 08:11:18 -08:00
commit 9715e66ba9
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/client/assets/lib/uploader.js
View File

@ -193,7 +193,10 @@
}
});
$dropzone.append('<a class="image-upload" title="Add image"><span class="hidden">Upload</span></a>');
// 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.find('a.image-upload').on('click', function () {
$dropzone.find('.js-url').remove();

27
core/client/assets/sass/modules/global.scss
View File

@ -1333,7 +1333,6 @@ main {
.image-url,
.image-upload {
@include icon($i-link, 12px);
line-height: 12px;
padding: 10px;
display: block;
@ -1342,7 +1341,21 @@ main {
left: 0;
color: $brown;
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 {
@include icon($i-image, 12px);
}
@ -1358,17 +1371,7 @@ main {
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 {
&.main{