diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-04-16 16:26:41 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-04-16 16:26:41 +0200 |
| commit | 9c6f8e59ae9f483e3285c8f25ed445758c79543b (patch) | |
| tree | 0a36776f3c30fd12fe7e760f922c0b24797bf501 | |
| parent | 547ddf77754fb73a49ce2aa89ea1f0bb28c353af (diff) | |
| download | nextcloud-server-9c6f8e59ae9f483e3285c8f25ed445758c79543b.tar.gz nextcloud-server-9c6f8e59ae9f483e3285c8f25ed445758c79543b.zip | |
fix header code duplication, code style fixes
| -rw-r--r-- | apps/files_sharing/css/public.css | 16 | ||||
| -rw-r--r-- | core/css/styles.css | 33 |
2 files changed, 28 insertions, 21 deletions
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index ebf19f50f00..062444f496f 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -1,19 +1,3 @@ -body { - height: auto; -} - -#header { - background-color: #1d2d44; - height:32px; - left:0; - line-height:32px; - position:fixed; - right:0; - top:0; - z-index:100; - padding:7px; -} - #controls { left: 0; } diff --git a/core/css/styles.css b/core/css/styles.css index c483950f300..28d7ef30f5f 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 { @@ -50,10 +67,16 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter: alpha(opacity=50); opacity: .5; + height: 100%; max-width: 40%; white-space: nowrap; - overflow: hidden; +} +.header-right #details { + display: inline-block; + margin-top: 6px; + width: 100%; text-overflow: ellipsis; + overflow: hidden; } /* Profile picture in header */ |