upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #9305 from owncloud/design-share-fixes

Browse source 
Design share fixes
This commit is contained in:
Jan-Christoph Borchardt 2014-06-30 18:46:37 +02:00
commit 07ba9442db
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files/css/files.css
View file

@ -307,8 +307,10 @@ table td.filename .nametext .innernametext {
/* for smaller resolutions - see mobile.css */
table td.filename .uploadtext { font-weight:normal; margin-left:8px; }
table td.filename form { font-size:14px; margin-left:46px; height: 40px; padding-top: 10px}
table td.filename .uploadtext {
font-weight: normal;
margin-left: 8px;
}
.ie8 input[type="checkbox"]{
padding: 0;

3
core/css/share.css
View file

@ -104,6 +104,7 @@ a.showCruds:hover,a.unshare:hover {
opacity:1;
}
#defaultExpireMessage, /* fix expire message going out of box */
.reshare { /* fix shared by text going out of box */
white-space:normal;
}
@ -118,4 +119,4 @@ a.showCruds:hover,a.unshare:hover {
padding-left: 12px;
padding-top: 12px;
color: #999;
}
}

2
core/js/share.js
View file

@ -364,7 +364,7 @@ OC.Share={
html += '<div id="expiration">';
html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />';
html += '<div id="defaultExpireMessage">'+defaultExpireMessage+'</div>';
html += '<em id="defaultExpireMessage">'+defaultExpireMessage+'</em>';
html += '</div>';
dropDownEl = $(html);
dropDownEl = dropDownEl.appendTo(appendTo);