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

Fix menu submenu after eec58ae32b0adf35af3aa550c1b1fe21bc2e963a 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2017-09-10 16:50:35 +02:00
parent ef41a55dc8
commit c6ac46fe92
No known key found for this signature in database
GPG Key ID: FB5ACEED51955BF8
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/css/apps.scss
View File

@ -103,9 +103,6 @@ kbd {
> li { > li {
display: inline-flex; display: inline-flex;
flex-wrap: wrap; flex-wrap: wrap;
position: relative;
width: 100%;
box-sizing: border-box;
&:focus, &:focus,
&:hover, &:hover,
&.active, &.active,
@ -138,6 +135,11 @@ kbd {
} }
} }
} }
}
li {
position: relative;
width: 100%;
box-sizing: border-box;
> a { > a {
background-size: 16px 16px; background-size: 16px 16px;
background-position: 14px center; background-position: 14px center;
@ -154,6 +156,7 @@ kbd {
color: $color-main-text; color: $color-main-text;
opacity: .57; opacity: .57;
flex: 1 1 0; flex: 1 1 0;
/* TODO: forbid using img as icon in menu? */
&:first-child img { &:first-child img {
margin-bottom: -3px; margin-bottom: -3px;
margin-right: 11px; margin-right: 11px;
@ -163,7 +166,7 @@ kbd {
/* Add padding if an icon is set with a class or an inline style */ /* Add padding if an icon is set with a class or an inline style */
&[class*='icon-'], &[class*='icon-'],
&[style*="background-image:"] { &[style*='background-image:'] {
padding-left: 44px; padding-left: 44px;
} }
@ -176,8 +179,9 @@ kbd {
} }
} }
} }
/* Popover fix the flex positionning of the li parent */
> .app-navigation-entry-menu { > .app-navigation-entry-menu {
/* fix the flex positionning of the li parent */
top: 44px; top: 44px;
} }
@ -193,6 +197,7 @@ kbd {
} }
} }
} }
.collapsible.open { .collapsible.open {
ul { ul {
display: block; display: block;
@ -333,8 +338,6 @@ kbd {
width: 100%; width: 100%;
} }
input { input {
border-bottom-right-radius: 0;
border-top-right-radius: 0;
padding: 5px; padding: 5px;
margin-right: 0; margin-right: 0;
height: 38px; height: 38px;
@ -343,17 +346,23 @@ kbd {
input[type='text'] { input[type='text'] {
width: 100%; width: 100%;
flex: 1 1 0; flex: 1 1 0;
border-bottom-right-radius: 0;
border-top-right-radius: 0;
} }
button, button,
input { input:not([type='text']) {
width: 36px; width: 36px;
height: 38px; height: 38px;
} &:not(:last-child) {
.icon-checkmark { border-radius: 0;
border-bottom-left-radius: 0; border-left: 0;
border-top-left-radius: 0; }
border-left: 0; &:last-child {
margin-right: 0; border-bottom-left-radius: 0;
border-top-left-radius: 0;
border-left: 0;
margin-right: 0;
}
} }
} }