From de1bc0b65332dfad907c3cad602833b839cd43b8 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 17 Sep 2015 13:15:45 +0200 Subject: [PATCH 1/2] fix sidebar Versions layout --- apps/files_versions/css/versions.css | 15 +++++---------- apps/files_versions/js/versionstabview.js | 3 +-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css index ec0f0cc989..b159de82ea 100644 --- a/apps/files_versions/css/versions.css +++ b/apps/files_versions/css/versions.css @@ -13,9 +13,7 @@ } .versionsTabView li > * { - padding: 7px; - float: left; - vertical-align: top; + vertical-align: middle; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter: alpha(opacity=50); opacity: .5; @@ -23,7 +21,7 @@ .versionsTabView li > a, .versionsTabView li > span { - padding: 17px 7px; + padding: 15px 10px 11px; } .versionsTabView li > *:hover, @@ -43,16 +41,13 @@ opacity: 1; } -.versionsTabView .versionDate { +.versionsTabView .versiondate { min-width: 100px; - vertical-align: text-bottom; + vertical-align: super; } .versionsTabView .revertVersion { cursor: pointer; float: right; - max-width: 130px; - text-overflow: ellipsis; - overflow: hidden; + margin-right: -10px; } - diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js index 1f84428e61..f6a6f03798 100644 --- a/apps/files_versions/js/versionstabview.js +++ b/apps/files_versions/js/versionstabview.js @@ -15,7 +15,7 @@ '' + '{{relativeTimestamp}}' + '' + - '{{revertLabel}}' + + '' + ''; var TEMPLATE = @@ -195,4 +195,3 @@ OCA.Versions.VersionsTabView = VersionsTabView; })(); - From 3eeea852b393ea7a248acfaa0cc1133d58e9010a Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 17 Sep 2015 13:17:56 +0200 Subject: [PATCH 2/2] fix sidebar Sharing layout a bit --- apps/files_sharing/css/sharetabview.css | 24 +++++++++++++----------- core/css/share.css | 16 +++------------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css index 0cc812e917..fe7a194750 100644 --- a/apps/files_sharing/css/sharetabview.css +++ b/apps/files_sharing/css/sharetabview.css @@ -12,22 +12,25 @@ } .shareTabView .shareWithRemoteInfo { - padding: 11px 0 11px 10px + padding: 11px 20px; } .shareTabView label { - font-weight:400; white-space: nowrap; } .shareTabView input[type="checkbox"] { - margin:0 3px 0 8px; + margin: 0 3px 0 8px; vertical-align: middle; } -.shareTabView input[type="text"], .shareTabView input[type="password"] { - width: 91%; - margin-left: 7px; +.shareTabView input[type="text"], +.shareTabView input[type="password"] { + width: 94%; + margin-left: 0; +} +.shareTabView #shareWith { + width: 80%; } .shareTabView form { @@ -37,15 +40,14 @@ } #shareWithList { - list-style-type:none; - padding:8px; + list-style-type: none; + padding: 0 0 16px; } #shareWithList li { - padding-top: 10px; - padding-bottom: 10px; + padding-top: 5px; + padding-bottom: 5px; font-weight: bold; - line-height: 21px; white-space: normal; } diff --git a/core/css/share.css b/core/css/share.css index 6467cc0239..15f8061b06 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -41,10 +41,6 @@ display: none !important; } -.shareTabView .shareWithRemoteInfo { - padding: 11px 20px; -} - .shareTabView .avatar { margin-right: 8px; display: inline-block; @@ -106,8 +102,9 @@ a.unshare { display:inline; float:right; opacity:.5; - padding:5px 0 0 5px !important; - margin-top:-5px; + padding: 10px; + margin-top: -5px; + margin-right: -10px; } #link { @@ -115,17 +112,10 @@ a.unshare { padding-top:8px; } -.shareTabView input[type="text"], -.shareTabView input[type="password"], .shareTabView input[type="submit"] { margin-left: 7px; } -.shareTabView input[type="text"], -.shareTabView input[type="password"] { - width: 86%; -} - .shareTabView form { font-size: 100%; margin-left: 0;