From 547ddf77754fb73a49ce2aa89ea1f0bb28c353af Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 16 Apr 2014 15:53:38 +0200 Subject: [PATCH] remove duplication of 'header-right' element, also make it overflow when too wide --- apps/files_sharing/css/public.css | 13 ------------- core/css/styles.css | 25 ++++++++++++++++++++++--- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index f0b9b04491..ebf19f50f0 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -14,19 +14,6 @@ body { padding:7px; } -.header-right { - padding: 0; - height: 32px; -} - -#details { - color:#fff; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - filter: alpha(opacity=50); - opacity: .5; - padding-right: 5px; -} - #controls { left: 0; } diff --git a/core/css/styles.css b/core/css/styles.css index 57e2c4479a..c483950f30 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -33,9 +33,28 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */ } -#owncloud { position:absolute; top:0; left:0; padding:6px; padding-bottom:0; } -.header-right { float:right; vertical-align:middle; padding:0.5em; } -.header-right > * { vertical-align:middle; } +#owncloud { + position: absolute; + top: 0; + left: 0; + padding: 6px; + padding-bottom: 0; +} + +/* info part on the right, used e.g. for info on who shared something */ +.header-right { + position: absolute; + right: 0; + padding-right: 10px; + color: #fff; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + filter: alpha(opacity=50); + opacity: .5; + max-width: 40%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} /* Profile picture in header */ #header .avatardiv {