From 12ff268e607738b03125ec6b212708391496d7f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 18 Sep 2013 17:20:14 +0200 Subject: [PATCH] move upload dialog css to separate file --- apps/files/css/files.css | 85 ------------------------ apps/files/css/upload.css | 119 ++++++++++++++++++++++++++++++++++ apps/files/index.php | 1 + apps/files_sharing/public.php | 1 + 4 files changed, 121 insertions(+), 85 deletions(-) create mode 100644 apps/files/css/upload.css diff --git a/apps/files/css/files.css b/apps/files/css/files.css index ff593fc4d2..e15c2b540d 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -357,88 +357,3 @@ table.dragshadow td.size { .mask.transparent{ opacity: 0; } - -.oc-dialog .fileexists table { - width: 100%; -} -.oc-dialog .fileexists th { - padding-left: 0; - padding-right: 0; -} -.oc-dialog .fileexists th input[type='checkbox'] { - margin-right: 3px; -} -.oc-dialog .fileexists th:first-child { - width: 230px; -} -.oc-dialog .fileexists th label { - font-weight: normal; - color:black; -} -.oc-dialog .fileexists th .count { - margin-left: 3px; -} -.oc-dialog .fileexists .conflict { - width: 100%; - height: 85px; -} -.oc-dialog .fileexists .conflict.template { - display: none; -} -.oc-dialog .fileexists .conflict .filename { - color:#777; - word-break: break-all; - clear: left; -} -.oc-dialog .fileexists .icon { - width: 64px; - height: 64px; - margin: 0px 5px 5px 5px; - background-repeat: no-repeat; - background-size: 64px 64px; - float: left; -} - -.oc-dialog .fileexists .replacement { - float: left; - width: 230px; -} -.oc-dialog .fileexists .original { - float: left; - width: 230px; -} -.oc-dialog .fileexists .conflicts { - overflow-y:scroll; - max-height: 225px; -} -.oc-dialog .fileexists .conflict input[type='checkbox'] { - float: left; -} - -.oc-dialog .fileexists .toggle { - background-image: url('%webroot%/core/img/actions/triangle-e.png'); - width: 16px; - height: 16px; -} -.oc-dialog .fileexists #allfileslabel { - float:right; -} -.oc-dialog .fileexists #allfiles { - vertical-align: bottom; - position: relative; - top: -3px; -} -.oc-dialog .fileexists #allfiles + span{ - vertical-align: bottom; -} - - - -.oc-dialog .oc-dialog-buttonrow { - width:100%; - text-align:right; -} - -.oc-dialog .oc-dialog-buttonrow .cancel { - float:left; -} diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css new file mode 100644 index 0000000000..2d11e41ba8 --- /dev/null +++ b/apps/files/css/upload.css @@ -0,0 +1,119 @@ + +#upload { + height:27px; padding:0; margin-left:0.2em; overflow:hidden; + vertical-align: top; +} +#upload a { + position:relative; display:block; width:100%; height:27px; + cursor:pointer; z-index:10; + background-image:url('%webroot%/core/img/actions/upload.svg'); + background-repeat:no-repeat; + background-position:7px 6px; + opacity:0.65; +} +.file_upload_target { display:none; } +.file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; } +#file_upload_start { + float: left; + left:0; top:0; width:28px; height:27px; padding:0; + font-size:1em; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; + z-index:20; position:relative; cursor:pointer; overflow:hidden; +} + +#uploadprogresswrapper { + display: inline-block; + vertical-align: top; + margin:0.3em; + height: 29px; +} +#uploadprogressbar { + position:relative; + float: left; + margin-left: 12px; + width: 130px; + height: 26px; + display:inline-block; +} +#uploadprogressbar + stop { + font-size: 13px; +} + +.oc-dialog .fileexists table { + width: 100%; +} +.oc-dialog .fileexists th { + padding-left: 0; + padding-right: 0; +} +.oc-dialog .fileexists th input[type='checkbox'] { + margin-right: 3px; +} +.oc-dialog .fileexists th:first-child { + width: 230px; +} +.oc-dialog .fileexists th label { + font-weight: normal; + color:black; +} +.oc-dialog .fileexists th .count { + margin-left: 3px; +} +.oc-dialog .fileexists .conflicts .template { + display: none; +} +.oc-dialog .fileexists .conflict { + width: 100%; + height: 85px; +} +.oc-dialog .fileexists .conflict .filename { + color:#777; + word-break: break-all; + clear: left; +} +.oc-dialog .fileexists .icon { + width: 64px; + height: 64px; + margin: 0px 5px 5px 5px; + background-repeat: no-repeat; + background-size: 64px 64px; + float: left; +} +.oc-dialog .fileexists .replacement { + float: left; + width: 230px; +} +.oc-dialog .fileexists .original { + float: left; + width: 230px; +} +.oc-dialog .fileexists .conflicts { + overflow-y:scroll; + max-height: 225px; +} +.oc-dialog .fileexists .conflict input[type='checkbox'] { + float: left; +} +.oc-dialog .fileexists .toggle { + background-image: url('%webroot%/core/img/actions/triangle-e.png'); + width: 16px; + height: 16px; +} +.oc-dialog .fileexists #allfileslabel { + float:right; +} +.oc-dialog .fileexists #allfiles { + vertical-align: bottom; + position: relative; + top: -3px; +} +.oc-dialog .fileexists #allfiles + span{ + vertical-align: bottom; +} +.oc-dialog .oc-dialog-buttonrow { + width:100%; + text-align:right; +} +.oc-dialog .oc-dialog-buttonrow .cancel { + float:left; +} diff --git a/apps/files/index.php b/apps/files/index.php index d46d8e32ee..9e54a706c0 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -26,6 +26,7 @@ OCP\User::checkLoggedIn(); // Load the files we need OCP\Util::addStyle('files', 'files'); +OCP\Util::addStyle('files', 'upload'); OCP\Util::addscript('files', 'file-upload'); OCP\Util::addscript('files', 'jquery.iframe-transport'); OCP\Util::addscript('files', 'jquery.fileupload'); diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 6d3a07a9d0..c997a7950c 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -170,6 +170,7 @@ if (isset($path)) { $tmpl->assign('dir', $getPath); OCP\Util::addStyle('files', 'files'); + OCP\Util::addStyle('files', 'upload'); OCP\Util::addScript('files', 'files'); OCP\Util::addScript('files', 'filelist'); OCP\Util::addscript('files', 'keyboardshortcuts');