diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-17 19:03:56 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-17 19:03:56 +0300 |
| commit | c18156a4fe553760b2d92018718b6ffcaab39d08 (patch) | |
| tree | 3945411a05dbef8ef5cc8ec23f8643cdfad9a53b /apps/files_versions | |
| parent | c74da41faf168312bea9ef79c924bd4521a169d8 (diff) | |
| parent | 3eeea852b393ea7a248acfaa0cc1133d58e9010a (diff) | |
Merge pull request #19121 from owncloud/sidebar-design-details
fix Files sidebar layout of Versions and Sharing
Diffstat (limited to 'apps/files_versions')
| -rw-r--r-- | apps/files_versions/css/versions.css | 15 | ||||
| -rw-r--r-- | 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 ec0f0cc9896..b159de82ea3 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 1f84428e616..f6a6f037988 100644 --- a/apps/files_versions/js/versionstabview.js +++ b/apps/files_versions/js/versionstabview.js @@ -15,7 +15,7 @@ '<a href="{{downloadUrl}}" class="downloadVersion"><img src="{{downloadIconUrl}}" />' + '<span class="versiondate has-tooltip" title="{{formattedTimestamp}}">{{relativeTimestamp}}</span>' + '</a>' + - '<a href="#" class="revertVersion"><img src="{{revertIconUrl}}" />{{revertLabel}}</a>' + + '<a href="#" class="revertVersion" title="{{revertLabel}}"><img src="{{revertIconUrl}}" /></a>' + '</li>'; var TEMPLATE = @@ -195,4 +195,3 @@ OCA.Versions.VersionsTabView = VersionsTabView; })(); - |