summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-09-10 17:07:19 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-09-21 14:00:34 +0200
commitc9719ca60173586bfab0cb984744e371fa4375b9 (patch)
treec6b2e5a2ba80b05b3fbc551cbc290d0acf7b3193
parentc6ac46fe92c202d069ee30c78c3e852a4f435158 (diff)
downloadnextcloud-server-c9719ca60173586bfab0cb984744e371fa4375b9.tar.gz
nextcloud-server-c9719ca60173586bfab0cb984744e371fa4375b9.zip
Syntax fix and collapse button padding if no icon on link
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
-rw-r--r--core/css/apps.scss16
1 files changed, 11 insertions, 5 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss
index e67db017d94..8dc1ba2fa33 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -136,7 +136,9 @@ kbd {
}
}
}
- li {
+ /* Menu and submenu */
+ > li,
+ > li > ul > li {
position: relative;
width: 100%;
box-sizing: border-box;
@@ -164,13 +166,13 @@ kbd {
margin-left: 2px;
}
- /* 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-'],
&[style*='background-image:'] {
padding-left: 44px;
}
- /* Counter can also be inside the link */
+ /* counter can also be inside the link */
> .app-navigation-entry-utils {
display: inline-block;
float: right;
@@ -180,12 +182,12 @@ kbd {
}
}
- /* Popover fix the flex positionning of the li parent */
+ /* popover fix the flex positionning of the li parent */
> .app-navigation-entry-menu {
top: 44px;
}
- /* Show edit/undo field if editing/deleted */
+ /* show edit/undo field if editing/deleted */
&.editing {
.app-navigation-entry-edit {
transform: translateX(0);
@@ -256,6 +258,10 @@ kbd {
outline: none !important;
box-shadow: none;
transition: transform 250ms ease-in-out;
+ /* force padding on link if collapse is here no matter if a has an icon class */
+ & + a {
+ padding-left: 44px;
+ }
}
&:hover > a,
&:focus > a {