diff --git a/apps/files/css/files.css b/apps/files/css/files.css index ecb58789f614ad7b4c3304152abe37c3878d8de8..89130e47fd385db1468f27fd40696b5416e74adf 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -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; diff --git a/core/css/share.css b/core/css/share.css index 314c6140d788ed2ef794808985bb412e703e83c6..f6f51376f11357439f038934e9800c546ddbda4f 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -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; -} +} \ No newline at end of file diff --git a/core/js/share.js b/core/js/share.js index aab41cf76da8e8d1d438ecfc8be7996d3f19ca18..5763664c5de51d4b1cea8d8c39c34bac58a4e074 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -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);