wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7431 from nextcloud/app-content-list-fixes

Browse source 
App content list fixes
This commit is contained in:
Roeland Jago Douma 2017-12-11 20:02:36 +01:00 committed by GitHub
commit bd80795d59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
core/css/apps.scss
View file

@ -910,42 +910,25 @@ kbd {
#app-content-wrapper {
display: flex;
position: relative;
align-items: start;
height: 100%;
width: 100%;
.app-content-list,
.app-content-detail {
min-height: 100%;
max-height: 100%;
overflow-x: hidden;
overflow-y: auto;
}
}
.app-content-list {
width: 300px;
min-height: 100%;
overflow-x: hidden;
overflow-y: auto;
border-right: 1px solid nc-darken($color-main-background, 8%);
display: flex;
flex-direction: column;
transition: transform 250ms ease-in-out;
/* Icon fixes */
[class^='icon-'],
[class*=' icon-'] {
order: 4;
width: 24px;
height: 24px;
margin: -10px;
padding: 22px;
opacity: .3;
&:hover, &:focus {
opacity: .7;
}
&[class^='icon-star'],
&[class*=' icon-star'] {
opacity: .7;
&:hover, &:focus {
opacity: 1 ;
}
}
&.icon-starred {
opacity: 1 ;
}
}
/* Default item */
.app-content-list-item {
position: relative;
@ -956,6 +939,36 @@ kbd {
display: flex;
flex-wrap: wrap;
align-items: center;
flex: 0 0 auto;
/* Icon fixes */
&,
> .app-content-list-item-menu {
> [class^='icon-'],
> [class*=' icon-'] {
order: 4;
width: 24px;
height: 24px;
margin: -10px;
padding: 22px;
opacity: .3;
cursor: pointer;
&:hover, &:focus {
opacity: .7;
}
&[class^='icon-star'],
&[class*=' icon-star'] {
opacity: .7;
&:hover, &:focus {
opacity: 1 ;
}
}
&.icon-starred {
opacity: 1 ;
}
}
}
&:hover, &:focus,
&.active {
@ -1011,6 +1024,7 @@ kbd {
text-transform: capitalize;
object-fit: cover;
user-select: none;
cursor: pointer;
}
.app-content-list-item-line-one,
@ -1023,6 +1037,7 @@ kbd {
order: 1;
flex: 1 1 0;
padding-right: 10px;
cursor: pointer;
}
.app-content-list-item-line-two {
@ -1041,11 +1056,21 @@ kbd {
font-size: 80%;
user-select: none;
}
.app-content-list-item-menu {
order: 4;
position: relative;
.popovermenu {
margin: 0;
right: -5px;
}
}
}
}
/* App content */
.app-content-detail {
width: 70%;
/* grow full width */
flex-grow: 1;
#app-navigation-toggle-back {
display: none;