diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-04-17 15:18:40 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-04-17 15:18:40 +0200 |
| commit | 0b4431216d0a05e12b3579316606b956f6d84120 (patch) | |
| tree | 6cb57d1846195c8761d611a24d57d512c6da57ea /core/css/styles.css | |
| parent | 13b463cc176cb547f2b5585e974c9357150585a2 (diff) | |
| parent | 9c6f8e59ae9f483e3285c8f25ed445758c79543b (diff) | |
| download | nextcloud-server-0b4431216d0a05e12b3579316606b956f6d84120.tar.gz nextcloud-server-0b4431216d0a05e12b3579316606b956f6d84120.zip | |
Merge pull request #8236 from owncloud/header-right-fix
remove duplication of header and 'header-right' element, also ellipsize when too wide
Diffstat (limited to 'core/css/styles.css')
| -rw-r--r-- | core/css/styles.css | 56 |
1 files changed, 49 insertions, 7 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 1cbaeb71825..c26c556825a 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -12,13 +12,30 @@ table, td, th { vertical-align:middle; } a { border:0; color:#000; text-decoration:none;} a, a *, input, input *, select, .button span, label { cursor:pointer; } ul { list-style:none; } -body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif; color:#000; } + + +body { + background: #fefefe; + font: normal .8em/1.6em "Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif; + color: #000; + height: auto; +} /* HEADERS */ -#body-user #header, #body-settings #header { - position:fixed; top:0; left:0; right:0; z-index:100; height:45px; line-height:2.5em; - background:#1d2d44 url('../img/noise.png') repeat; +#body-user #header, +#body-settings #header, +#body-public #header { + position: fixed; + top: 0; + left: 0; + right: 0; + z-index: 100; + height: 45px; + line-height: 2.5em; + background: #1d2d44 url('../img/noise.png') repeat; + -moz-box-sizing: border-box; + box-sizing: border-box; } #body-login { @@ -33,9 +50,34 @@ 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; + height: 100%; + max-width: 40%; + white-space: nowrap; +} +.header-right #details { + display: inline-block; + margin-top: 6px; + width: 100%; + text-overflow: ellipsis; + overflow: hidden; +} /* Profile picture in header */ #header .avatardiv { |