Merge pull request #4032 from owncloud/more-whitespace

More whitespace
This commit is contained in:
Morris Jobke 2013-08-16 01:02:03 -07:00
commit c196985ea3
1 changed files with 82 additions and 47 deletions

View File

@ -161,7 +161,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
#content { position:relative; height:100%; width:100%; } #content { position:relative; height:100%; width:100%; }
#content .hascontrols { position: relative; top: 2.9em; } #content .hascontrols { position: relative; top: 2.9em; }
#content-wrapper { #content-wrapper {
position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:64px; position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:80px;
-moz-box-sizing:border-box; box-sizing:border-box; -moz-box-sizing:border-box; box-sizing:border-box;
} }
#leftcontent, .leftcontent { #leftcontent, .leftcontent {
@ -440,17 +440,30 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
/* NAVIGATION ------------------------------------------------------------- */ /* NAVIGATION ------------------------------------------------------------- */
#navigation { #navigation {
position:fixed; float:left; width:64px; padding-top:3.5em; z-index:75; height:100%; position: fixed;
float: left;
width: 80px;
padding-top: 3.5em;
z-index: 75;
height: 100%;
background:#383c43 url('../img/noise.png') repeat; background:#383c43 url('../img/noise.png') repeat;
-moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000; -moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000;
overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box; overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box;
/* prevent ugly selection effect on accidental selection */
-webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
}
#navigation:hover {
overflow-y: auto; /* show scrollbar only on hover */
} }
#navigation:hover { overflow-y:auto; } /* show scrollbar only on hover */
#navigation a span { #navigation a span {
display:block; display: block;
text-decoration:none; font-size:10px; text-align:center; text-decoration: none;
color:#fff; text-shadow:#000 0 -1px 0; font-size: 11px;
text-align: center;
color: #fff;
text-shadow: #000 0 -1px 0;
white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */ white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */
padding-bottom: 10px;
} }
/* icon opacity and hover effect */ /* icon opacity and hover effect */
@ -475,14 +488,16 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
filter: alpha(opacity=100); filter: alpha(opacity=100);
opacity: 1; opacity: 1;
} }
/* positioning */
#navigation .icon { #navigation .icon {
display:block; display: block;
width:32px; height:32px; width: 32px;
margin:0 16px 0; padding:8px 0 4px; height: 32px;
margin-left: 24px;
padding: 10px 0 4px;
}
#navigation li:first-child .icon { /* special rule for Files icon as it's first */
padding-top: 20px;
} }
#navigation li:first-child a { padding-top:16px; }
#apps-management { #apps-management {
opacity: .6; opacity: .6;
@ -500,18 +515,30 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
background:#383c43 url('../img/noise.png') repeat; background:#383c43 url('../img/noise.png') repeat;
border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid; border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
-moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68); -moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68);
-moz-box-sizing: border-box; box-sizing: border-box;
/* prevent ugly selection effect on accidental selection */
-webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
} }
#expanddiv a { #expanddiv a {
display:block; color:#fff; text-shadow:0 -1px 0 #000; padding:0 8px; display: block;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; height: 40px;
filter:alpha(opacity=70); color: #fff;
opacity:.7; text-shadow: 0 -1px 0 #000;
padding: 4px 12px 0;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
filter: alpha(opacity=70);
opacity: .7;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
#expanddiv a img {
margin-bottom: -3px;
margin-right: 6px;
} }
#expanddiv a img { margin-bottom:-3px; }
#expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active {
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
filter:alpha(opacity=100); filter: alpha(opacity=100);
opacity:1; opacity: 1;
} }
@ -643,13 +670,15 @@ div.crumb:active {
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
#app * {
-moz-box-sizing: border-box; box-sizing: border-box;
}
/* Navigation: folder like structure */ /* Navigation: folder like structure */
#app-navigation { #app-navigation {
width: 250px; width: 300px;
height: 100%; height: 100%;
float: left; float: left;
padding-bottom: 32px;
-moz-box-sizing: border-box; box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box;
background-color: #f8f8f8; background-color: #f8f8f8;
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
@ -666,7 +695,8 @@ div.crumb:active {
text-shadow: 0 1px 0 rgba(255,255,255,.9); text-shadow: 0 1px 0 rgba(255,255,255,.9);
} }
#app-navigation .active, #app-navigation .active,
#app-navigation .active a { /* active navigation entry or folder */ #app-navigation .active a,
#app-navigation li:hover > a {
background-color: #ddd; background-color: #ddd;
text-shadow: 0 1px 0 rgba(255,255,255,.7); text-shadow: 0 1px 0 rgba(255,255,255,.7);
} }
@ -674,49 +704,38 @@ div.crumb:active {
/* special rules for first-level entries and folders */ /* special rules for first-level entries and folders */
#app-navigation > ul > li { #app-navigation > ul > li {
background-color: #eee; background-color: #eee;
border-top: 1px solid #fff;
border-bottom: 1px solid #ddd;
}
#app-navigation > ul > .active {
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
} }
#app-navigation .with-icon a { #app-navigation .with-icon a {
padding-left: 32px; padding-left: 44px;
background-size: 16px 16px; background-position: 10px center; background-repeat: no-repeat; background-size: 16px 16px;
background-position: 14px center;
background-repeat: no-repeat;
} }
#app-navigation li > a { #app-navigation li > a {
display: block; display: block;
width: 100%; width: 100%;
padding: 0 16px; height: 44px;
padding: 12px;
overflow: hidden; overflow: hidden;
-moz-box-sizing: border-box; box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box;
line-height: 32px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
color: #333; color: #333;
} }
#app-navigation li:hover > a {
background-color: #ddd;
}
#app-navigation > ul > li:hover {
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
#app-navigation .collapse { #app-navigation .collapse {
display: none; /* hide collapse button intially */ display: none; /* hide collapse button intially */
} }
#app-navigation .collapsible > .collapse { #app-navigation .collapsible > .collapse {
position: absolute; position: absolute;
left: 6px; height: 44px;
top: 5px; width: 44px;
height: 16px; margin: 0;
width: 16px; padding: 0;
background: none; background-image: url('../img/actions/triangle-s.svg'); background: none; background-image: url('../img/actions/triangle-s.svg');
background-size: 16px 16px; background-repeat: no-repeat; background-size: 16px; background-repeat: no-repeat; background-position: center;
border: none; border: none;
border-radius: 0; border-radius: 0;
outline: none !important; outline: none !important;
@ -766,13 +785,29 @@ div.crumb:active {
#app-navigation > ul .open:hover { #app-navigation > ul .open:hover {
-moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc; -moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
border-top: 1px solid #ccc;
} }
#app-navigation > ul .open ul { #app-navigation > ul .open ul {
display: block; display: block;
} }
/* counter and actions */
#app-navigation .utils {
position: absolute;
right: 0;
top: 0;
bottom: 0;
font-size: 12px;
}
#app-navigation .utils button,
#app-navigation .utils .counter {
width: 44px;
height: 44px;
padding-top: 12px;
}
/* drag and drop */ /* drag and drop */
#app-navigation .drag-and-drop { #app-navigation .drag-and-drop {
-moz-transition: padding-bottom 500ms ease 0s; -moz-transition: padding-bottom 500ms ease 0s;
@ -800,7 +835,7 @@ div.crumb:active {
/* settings area */ /* settings area */
#app-settings { #app-settings {
position: fixed; position: fixed;
width: 249px; width: 299px;
bottom: 0; bottom: 0;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
} }