mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8236 from owncloud/header-right-fix 

remove duplication of header and 'header-right' element, also ellipsize when too wide
This commit is contained in:
Morris Jobke 2014-04-17 15:18:40 +02:00
parent 13b463cc17 9c6f8e59ae
commit 0b4431216d
2 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/files_sharing/css/public.css
View File

@ -1,32 +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;
}
.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;
}

56
core/css/styles.css
View File

@ -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 {